re PR tree-optimization/50644 (ICE in set_is_used added today)

	PR middle-end/50644
	PR middle-end/50741

	* tree-ssa-live.c (mark_all_vars_used_1): Recurse only for decls of
	current function.
	(remove_unused_locals): Ditto.

testsuite/

	* g++.dg/tree-ssa/pr50741.C: New.

From-SVN: r181443

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1d734149ba4ebbc64c07e511b6df733c2eb7f100..b0ed872c5a502a8383687f839d7ca7f66c58671c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-17  Michael Matz  <matz@suse.de>
+
+       PR middle-end/50644
+       PR middle-end/50741
+       * tree-ssa-live.c (mark_all_vars_used_1): Recurse only for decls of
+       current function.
+       (remove_unused_locals): Ditto.
+
 2011-11-16  Richard Henderson  <rth@redhat.com>
 
        * config/alpha/alpha.c (alpha_split_compare_and_swap_12): Copy

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 00b9a19b7f52c67724331d06708832fb5b7e8f29..f345882e676ad81da0ddf064e7f5de394a47e467 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-17  Michael Matz  <matz@suse.de>
+
+       PR middle-end/50644
+       PR middle-end/50741
+       * g++.dg/tree-ssa/pr50741.C: New.
+
 2011-11-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * lib/gcc-simulate-thread.exp (simulate-thread): Skip on

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr50741.C b/gcc/testsuite/g++.dg/tree-ssa/pr50741.C
new file mode 100644 (file)
index 0000000..843a7be
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr50741.C
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+/* PR middle-end/50741 */
+
+struct PublishLo
+{
+  const char *functionName;
+  ~PublishLo();
+};
+struct A { A(); };
+A::A()
+{
+  static PublishLo _rL_53 = {__FUNCTION__};
+}

diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 2a2c13393fea431f98aabcc121508a173bc85e76..b8a056ebdac074c64cd4d1835f9a4acb7bf9bc5e 100644 (file)
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -374,7 +374,8 @@ mark_all_vars_used_1 (tree *tp, int *walk_subtrees, void *data)
      eliminated as unused.  */
   if (TREE_CODE (t) == VAR_DECL)
     {
-      if (data != NULL && bitmap_clear_bit ((bitmap) data, DECL_UID (t)))
+      if (data != NULL && bitmap_clear_bit ((bitmap) data, DECL_UID (t))
+         && DECL_CONTEXT (t) == current_function_decl)
        mark_all_vars_used (&DECL_INITIAL (t), data);
       set_is_used (t);
     }
@@ -836,7 +837,8 @@ remove_unused_locals (void)
        if (TREE_CODE (var) == VAR_DECL
            && is_global_var (var)
            && var_ann (var) != NULL
-           && is_used_p (var))
+           && is_used_p (var)
+           && DECL_CONTEXT (var) == current_function_decl)
          mark_all_vars_used (&DECL_INITIAL (var), global_unused_vars);
 
       num = VEC_length (tree, cfun->local_decls);