re PR tree-optimization/78413 (ICE in single_pred_edge, at basic-block.h:361)

[gcc]

2016-11-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	PR tree-optimization/78413
	* tree-if-conv.c (versionable_outer_loop_p): Require that both
	inner and outer loop latches have single predecessors.

[gcc/testsuite]

2016-11-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	PR tree-optimization/78413
	* gcc.dg/tree-ssa/pr78413.c: New test.

From-SVN: r242661

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e93762..9fbecbd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+       PR tree-optimization/78413
+       * tree-if-conv.c (versionable_outer_loop_p): Require that both
+       inner and outer loop latches have single predecessors.
+
 2016-11-21  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/78093

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 924319e..379c4f0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+       PR tree-optimization/78413
+       * gcc.dg/tree-ssa/pr78413.c: New test.
+
 2016-11-21  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        * gcc.target/arm/empty_fiq_handler.c: Skip if -mthumb is passed in and

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr78413.c b/gcc/testsuite/gcc.dg/tree-ssa/pr78413.c
new file mode 100644 (file)
index 0000000..049ecd7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr78413.c
@@ -0,0 +1,35 @@
+/* PR78413.  These previously failed in tree if-conversion due to a loop
+   latch with multiple predecessors that the code did not anticipate.  */
+/* { dg-do compile } */
+/* { dg-options "-O3 -ffast-math -fno-strict-aliasing" } */
+
+extern long long int llrint(double x);
+int a;
+double b;
+__attribute__((cold)) void decode_init() {
+  int c, d = 0;
+  for (; d < 12; d++) {
+    if (d)
+      b = 0;
+    c = 0;
+    for (; c < 6; c++)
+      a = b ? llrint(b) : 0;
+  }
+}
+
+struct S {
+  _Bool bo;
+};
+int a, bb, c, d;
+void fn1() {
+  do
+    do
+      do {
+       struct S *e = (struct S *)1;
+       do
+         bb = a / (e->bo ? 2 : 1);
+       while (bb);
+      } while (0);
+    while (d);
+  while (c);
+}

diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 1235faf..dc43d95 100644 (file)
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -2575,6 +2575,8 @@ version_loop_for_if_conversion (struct loop *loop)
     - The loop has a single exit.
     - The loop header has a single successor, which is the inner
       loop header.
+    - Each of the inner and outer loop latches have a single
+      predecessor.
     - The loop exit block has a single predecessor, which is the
       inner loop's exit block.  */
 
@@ -2586,7 +2588,9 @@ versionable_outer_loop_p (struct loop *loop)
       || loop->inner->next
       || !single_exit (loop)
       || !single_succ_p (loop->header)
-      || single_succ (loop->header) != loop->inner->header)
+      || single_succ (loop->header) != loop->inner->header
+      || !single_pred_p (loop->latch)
+      || !single_pred_p (loop->inner->latch))
     return false;
   
   basic_block outer_exit = single_pred (loop->latch);