re PR tree-optimization/82217 (ICE on valid code at -O1 and above: in visit_phi,...

2017-09-15  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/82217
	* tree-ssa-sccvn.c (visit_phi): Properly handle all VN_TOP
	but not undefined case.

	* gcc.dg/torture/pr82217.c: New testcase.

From-SVN: r252796

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4711d4e16c1e516401e3fb703426e56202b01117..65bfc163f5a5ce896315989e6561f72a0d3d68d3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-15  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/82217
+       * tree-ssa-sccvn.c (visit_phi): Properly handle all VN_TOP
+       but not undefined case.
+
 2017-09-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/82145

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b47923b38025409306db205af405bbeb360b7e97..cd3f7a96c0dfa47b07a710c5f7af6561329beb94 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-15  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/82217
+       * gcc.dg/torture/pr82217.c: New testcase.
+
 2017-09-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/82145

diff --git a/gcc/testsuite/gcc.dg/torture/pr82217.c b/gcc/testsuite/gcc.dg/torture/pr82217.c
new file mode 100644 (file)
index 0000000..471f474
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr82217.c
@@ -0,0 +1,32 @@
+/* { dg-do compile } */
+
+int a, b, c;
+
+void fn1 ()
+{ 
+  while (1)
+    { 
+      if (c)
+       goto L2;
+      break;
+    }
+  if (c)
+    {
+L1:
+       {
+         int g[1];
+         if (b)
+           goto L1;
+         goto L1;
+L2:
+         for (a = 0; a;)
+           goto L1;
+       }
+    }
+}
+
+int main ()
+{ 
+  fn1 ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 44618daedce3d5d77a2320661c57277cb1caca41..0b0c5106d3022c362344617a2bb7735535ecad06 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -3901,13 +3901,10 @@ visit_phi (gimple *phi)
      if only a single edge is exectuable use its value.  */
   if (n_executable <= 1)
     result = seen_undef ? seen_undef : sameval;
-  /* If we saw only undefined values create a new undef SSA name to
-     avoid false equivalences.  */
+  /* If we saw only undefined values and VN_TOP use one of the
+     undefined values.  */
   else if (sameval == VN_TOP)
-    {
-      gcc_assert (seen_undef);
-      result = seen_undef;
-    }
+    result = seen_undef ? seen_undef : sameval;
   /* First see if it is equivalent to a phi node in this block.  We prefer
      this as it allows IV elimination - see PRs 66502 and 67167.  */
   else if ((result = vn_phi_lookup (phi)))