diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 28f7722..0a8ada7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-07-20 Richard Guenther <rguenther@suse.de> + + * tree-inline.c (add_local_variables): Remove check_var_ann + parameter and dead code. + (expand_call_inline): Adjust. + (tree_function_versioning): Likewise. + 2012-07-20 Jakub Jelinek <jakub@redhat.com> PR c++/28656 diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 061f4c5..3131525 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3781,19 +3781,13 @@ prepend_lexical_block (tree current_block, tree new_block) static inline void add_local_variables (struct function *callee, struct function *caller, - copy_body_data *id, bool check_var_ann) + copy_body_data *id) { tree var; unsigned ix; FOR_EACH_LOCAL_DECL (callee, ix, var) - if (TREE_STATIC (var) && !TREE_ASM_WRITTEN (var)) - { - if (!check_var_ann - || (var_ann (var) && add_referenced_var (var))) - add_local_decl (caller, var); - } - else if (!can_be_nonlocal (var, id)) + if (!can_be_nonlocal (var, id)) { tree new_var = remap_decl (var, id); @@ -4027,7 +4021,7 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id) use_retvar = declare_return_variable (id, return_slot, modify_dest, bb); /* Add local vars in this inlined callee to caller. */ - add_local_variables (id->src_cfun, cfun, id, true); + add_local_variables (id->src_cfun, cfun, id); if (dump_file && (dump_flags & TDF_DETAILS)) { @@ -5255,7 +5249,7 @@ tree_function_versioning (tree old_decl, tree new_decl, if (!VEC_empty (tree, DECL_STRUCT_FUNCTION (old_decl)->local_decls)) /* Add local vars. */ - add_local_variables (DECL_STRUCT_FUNCTION (old_decl), cfun, &id, false); + add_local_variables (DECL_STRUCT_FUNCTION (old_decl), cfun, &id); if (DECL_RESULT (old_decl) == NULL_TREE) ; |