diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/f95-lang.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a90b51a..74ea42a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-11-12 Jan Hubicka <jh@suse.cz> + + * f95-lang.c (ATTR_NOTHROW_LEAF_MALLOC_LIST): New macro. + (gfc_define_builtin): Use set_call_expr_flags. + (gfc_init_builtin_functions): Update. + 2012-11-12 Tobias Burnus <burnus@net-b.de> PR fortran/55272 diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 6ff1356..be0d99f 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -535,6 +535,7 @@ gfc_builtin_function (tree decl) /* So far we need just these 4 attribute types. */ #define ATTR_NOTHROW_LEAF_LIST (ECF_NOTHROW | ECF_LEAF) +#define ATTR_NOTHROW_LEAF_MALLOC_LIST (ECF_NOTHROW | ECF_LEAF | ECF_MALLOC) #define ATTR_CONST_NOTHROW_LEAF_LIST (ECF_NOTHROW | ECF_LEAF | ECF_CONST) #define ATTR_NOTHROW_LIST (ECF_NOTHROW) #define ATTR_CONST_NOTHROW_LIST (ECF_NOTHROW | ECF_CONST) @@ -547,13 +548,7 @@ gfc_define_builtin (const char *name, tree type, enum built_in_function code, decl = add_builtin_function (name, type, code, BUILT_IN_NORMAL, library_name, NULL_TREE); - if (attr & ECF_CONST) - TREE_READONLY (decl) = 1; - if (attr & ECF_NOTHROW) - TREE_NOTHROW (decl) = 1; - if (attr & ECF_LEAF) - DECL_ATTRIBUTES (decl) = tree_cons (get_identifier ("leaf"), - NULL, DECL_ATTRIBUTES (decl)); + set_call_expr_flags (decl, attr); set_builtin_decl (code, decl, true); } @@ -916,13 +911,12 @@ gfc_init_builtin_functions (void) ftype = build_function_type_list (pvoid_type_node, size_type_node, NULL_TREE); gfc_define_builtin ("__builtin_malloc", ftype, BUILT_IN_MALLOC, - "malloc", ATTR_NOTHROW_LEAF_LIST); - DECL_IS_MALLOC (builtin_decl_explicit (BUILT_IN_MALLOC)) = 1; + "malloc", ATTR_NOTHROW_LEAF_MALLOC_LIST); ftype = build_function_type_list (pvoid_type_node, size_type_node, size_type_node, NULL_TREE); gfc_define_builtin ("__builtin_calloc", ftype, BUILT_IN_CALLOC, - "calloc", ATTR_NOTHROW_LEAF_LIST); + "calloc", ATTR_NOTHROW_LEAF_MALLOC_LIST); DECL_IS_MALLOC (builtin_decl_explicit (BUILT_IN_CALLOC)) = 1; ftype = build_function_type_list (pvoid_type_node, |