re PR tree-optimization/32353 (Miscompilation with RESULT_DECL)

	PR tree-optimization/32353
	* tree-ssa-structalias.c (set_uids_in_ptset): Also handle RESULT_DECL.

	* g++.dg/opt/nrv13.C: New test.

From-SVN: r125841

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 616f658ddb3eec7f632402ee3c1ece5296433d61..e7cd5a0d2de08a2727211d5fdc05fdf473b65b02 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/32353
+       * tree-ssa-structalias.c (set_uids_in_ptset): Also handle RESULT_DECL.
+
 2007-06-18  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/32389

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 19bd0f85e8bcab2e9e5a955c9d76bc9ede13d335..467635d0fb737325f57d535657f5fb30504c4dc6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/32353
+       * g++.dg/opt/nrv13.C: New test.
+
 2007-06-19  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/20863

diff --git a/gcc/testsuite/g++.dg/opt/nrv13.C b/gcc/testsuite/g++.dg/opt/nrv13.C
new file mode 100644 (file)
index 0000000..bb49a3a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/nrv13.C
@@ -0,0 +1,42 @@
+// PR tree-optimization/32353
+// { dg-do run }
+// { dg-options "-O2" }
+
+extern "C" void abort ();
+
+struct A
+{
+  int f;
+  A (int x) : f (x) {}
+};
+
+A
+foo (const A &x, const A &y)
+{
+  A r (0);
+  r = x.f == -111 ? y : (y.f == -111 || x.f > y.f) ? x : y;
+  A s (0);
+  r = r.f == -111 ? s : (r.f > s.f) ? r : s;
+  return r;
+}
+
+int
+main ()
+{
+  if (foo (A (0), A (1)).f != 1)
+    abort ();
+  if (foo (A (1), A (9)).f != 9)
+    abort ();
+  if (foo (A (9), A (1)).f != 9)
+    abort ();
+  if (foo (A (-4), A (-5)).f != 0)
+    abort ();
+  if (foo (A (-111), A (-111)).f != 0)
+    abort ();
+  if (foo (A (2), A (-111)).f != 2)
+    abort ();
+  if (foo (A (-111), A (6)).f != 6)
+    abort ();
+  if (foo (A (-111), A (-4)).f != 0)
+    abort ();
+}

diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index f1abf37308ae5fe7fae1aa9f12b5663585338949..2b69728300231486f269a71d39ef01aa0655c9a7 100644 (file)
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -4342,7 +4342,8 @@ set_uids_in_ptset (tree ptr, bitmap into, bitmap from, bool is_derefed,
            bitmap_set_bit (into, DECL_UID (sv->var));
        }
       else if (TREE_CODE (vi->decl) == VAR_DECL
-              || TREE_CODE (vi->decl) == PARM_DECL)
+              || TREE_CODE (vi->decl) == PARM_DECL
+              || TREE_CODE (vi->decl) == RESULT_DECL)
        {
          if (var_can_have_subvars (vi->decl)
              && get_subvars_for_var (vi->decl))