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: r125843

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 55709ca1aa6dd2d2e6b6e43a17d7312f93b3e03c..bcb24e146c55965f7c98e821b3fe6962cc6ce6bd 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-13  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * config/sparc/sparc.c (sparc_override_options): Initialize

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e43b6f0508d6bb2a21f36c7f8184e7c720c55247..97efa9fe6820cf32354bc041944c4ac4655b5baa 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-17  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * gcc.target/sparc/align.c: Use 'unsigned char' as element type.

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 0bc5ecaabc6c3c7d8a662d7ee89922b527253a34..bcc1dac3e0ed2b846b9f82fc196bccad86d1a2a6 100644 (file)
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -3405,7 +3405,8 @@ set_uids_in_ptset (bitmap into, bitmap from)
            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 (found_anyoffset
              && var_can_have_subvars (vi->decl)