tree-inline.c (add_local_variables): Remove check_var_ann parameter and dead code.

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.

From-SVN: r189712

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28f7722cc8381c2620cdc33e7341d6b25f3bca6d..0a8ada7ccf6181878077895d0a032970cba6febd 100644 (file)
--- 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 061f4c5a99763124c5d16b8f5c21942d4a7d1eb3..3131525fb8b375bbff16286143b2ebe5d26fb240 100644 (file)
--- 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)
     ;