re PR tree-optimization/60740 (ICE in extract_affine w/ -O2 -ftree-loop-linear)

2014-04-03  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/60740
	* graphite-scop-detection.c (stmt_simple_for_scop_p): Iterate
	over all GIMPLE_COND operands.

	* gcc.dg/graphite/pr60740.c: New testcase.

From-SVN: r209057

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f01c4066f883bf4c152c428b5cf74af645c45343..0756170c8ba7c082c76fb397c6f95adfebebf718 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/60740
+       * graphite-scop-detection.c (stmt_simple_for_scop_p): Iterate
+       over all GIMPLE_COND operands.
+
 2014-04-03  Nathan Sidwell  <nathan@codesourcery.com>
 
        * doc/invoke.texi (Wnon-virtual-dtor): Adjust documentation.

diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 1d7c7485f85c0a340141be30118528b20c350c07..b5e4a8c8cb3d4ad3d65800df917cf0fa43f6258f 100644 (file)
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -346,13 +346,10 @@ stmt_simple_for_scop_p (basic_block scop_entry, loop_p outermost_loop,
 
     case GIMPLE_COND:
       {
-       tree op;
-       ssa_op_iter op_iter;
-        enum tree_code code = gimple_cond_code (stmt);
-
        /* We can handle all binary comparisons.  Inequalities are
           also supported as they can be represented with union of
           polyhedra.  */
+        enum tree_code code = gimple_cond_code (stmt);
         if (!(code == LT_EXPR
              || code == GT_EXPR
              || code == LE_EXPR
@@ -361,11 +358,14 @@ stmt_simple_for_scop_p (basic_block scop_entry, loop_p outermost_loop,
              || code == NE_EXPR))
           return false;
 
-       FOR_EACH_SSA_TREE_OPERAND (op, stmt, op_iter, SSA_OP_ALL_USES)
-         if (!graphite_can_represent_expr (scop_entry, loop, op)
-             /* We can not handle REAL_TYPE. Failed for pr39260.  */
-             || TREE_CODE (TREE_TYPE (op)) == REAL_TYPE)
-           return false;
+       for (unsigned i = 0; i < 2; ++i)
+         {
+           tree op = gimple_op (stmt, i);
+           if (!graphite_can_represent_expr (scop_entry, loop, op)
+               /* We can not handle REAL_TYPE. Failed for pr39260.  */
+               || TREE_CODE (TREE_TYPE (op)) == REAL_TYPE)
+             return false;
+         }
 
        return true;
       }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b51d81ed943dcd11c67155410f27a88238ae9380..3a58dc297454329714f80f186b2a70072b2fafeb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-03  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/60740
+       * gcc.dg/graphite/pr60740.c: New testcase.
+
 2014-04-03  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.dg/warn/Wnvdtor.C: Add non-polymorphic case.

diff --git a/gcc/testsuite/gcc.dg/graphite/pr60740.c b/gcc/testsuite/gcc.dg/graphite/pr60740.c
new file mode 100644 (file)
index 0000000..5b7c180
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr60740.c
@@ -0,0 +1,16 @@
+/* { dg-options "-O2 -floop-interchange" } */
+
+int **db6 = 0;
+
+void
+k26(void)
+{
+  static int geb = 0;
+  int *a22 = &geb;
+  int **l30 = &a22;
+  int *c4b;
+  int ndf;
+  for (ndf = 0; ndf <= 1; ++ndf)
+    *c4b = (db6 == l30) && (*a22)--;
+}
+