re PR tree-optimization/83176 ([graphite] ICE in set_codegen_error, at graphite-isl...

2018-01-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/83176
	* tree-chrec.c (chrec_fold_plus_1): Handle (signed T){(T) .. }
	operands.

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

From-SVN: r257013

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12341eac44e2729482633bb5a32dcd0788e41ad4..0e48b861c4fd785ae525aedf2bea6f215e29c177 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/83176
+       * tree-chrec.c (chrec_fold_plus_1): Handle (signed T){(T) .. }
+       operands.
+
 2018-01-24  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/82819

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eed77ed4084674a8eaed2e988b252de3bba9e011..b13ec74815a8a9a12cb1279beff78cb3d0f0d46b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/83176
+       * gcc.dg/graphite/pr83176.c: New testcase.
+
 2018-01-24  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/82819

diff --git a/gcc/testsuite/gcc.dg/graphite/pr83176.c b/gcc/testsuite/gcc.dg/graphite/pr83176.c
new file mode 100644 (file)
index 0000000..4c3df44
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr83176.c
@@ -0,0 +1,42 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
+
+int wx, qi;
+
+void
+yj (int gw)
+{
+  int *ak = &gw;
+
+  while (wx != 0)
+    {
+      int k2 = (__INTPTR_TYPE__)&ak;
+      int **xq = (int **)&k2;
+
+ja:
+      *xq = &gw;
+
+      while (qi < 1)
+       {
+         unsigned short int ey;
+
+be:
+         for (ey = 0; ey < 251; ++ey)
+           {
+             for (wx = 0; wx < 2; ++wx)
+               {
+               }
+
+             *ak += 8555712;
+             k2 += *ak;
+           }
+         ++qi;
+       }
+    }
+
+  gw = 1;
+  if (gw != 0)
+    goto ja;
+  else
+    goto be;
+}

diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 924df04783cef62499119e756013bdffac71ed15..896ff357842530af0c186e46715dca2ea2942f6e 100644 (file)
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -295,8 +295,23 @@ chrec_fold_plus_1 (enum tree_code code, tree type,
          return chrec_fold_plus_poly_poly (code, type, op0, op1);
 
        CASE_CONVERT:
-         if (tree_contains_chrecs (op1, NULL))
-           return chrec_dont_know;
+         {
+           /* We can strip sign-conversions to signed by performing the
+              operation in unsigned.  */
+           tree optype = TREE_TYPE (TREE_OPERAND (op1, 0));
+           if (INTEGRAL_TYPE_P (type)
+               && INTEGRAL_TYPE_P (optype)
+               && tree_nop_conversion_p (type, optype)
+               && TYPE_UNSIGNED (optype))
+             return chrec_convert (type,
+                                   chrec_fold_plus_1 (code, optype,
+                                                      chrec_convert (optype,
+                                                                     op0, NULL),
+                                                      TREE_OPERAND (op1, 0)),
+                                   NULL);
+           if (tree_contains_chrecs (op1, NULL))
+             return chrec_dont_know;
+         }
          /* FALLTHRU */
 
        default:
@@ -313,8 +328,23 @@ chrec_fold_plus_1 (enum tree_code code, tree type,
        }
 
     CASE_CONVERT:
-      if (tree_contains_chrecs (op0, NULL))
-       return chrec_dont_know;
+      {
+       /* We can strip sign-conversions to signed by performing the
+          operation in unsigned.  */
+       tree optype = TREE_TYPE (TREE_OPERAND (op0, 0));
+       if (INTEGRAL_TYPE_P (type)
+           && INTEGRAL_TYPE_P (optype)
+           && tree_nop_conversion_p (type, optype)
+           && TYPE_UNSIGNED (optype))
+         return chrec_convert (type,
+                               chrec_fold_plus_1 (code, optype,
+                                                  TREE_OPERAND (op0, 0),
+                                                  chrec_convert (optype,
+                                                                 op1, NULL)),
+                               NULL);
+       if (tree_contains_chrecs (op0, NULL))
+         return chrec_dont_know;
+      }
       /* FALLTHRU */
 
     default: