From: Sebastian Pop <sebastian.pop@amd.com>
Date: Thu, 3 Jan 2008 02:38:24 +0000 (+0000)
Subject: re PR tree-optimization/34635 (tree check: expected polynomial_chrec, have integer_cs... 
X-Git-Tag: releases/gcc-4.3.0~771
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=097392de6b7eb5cba34ed8f367ab79837d7cedd2;p=thirdparty%2Fgcc.git

re PR tree-optimization/34635 (tree check: expected polynomial_chrec, have integer_cst in add_multivariate_self_dist, at tree-data-ref.c:2813)

2007-12-19  Sebastian Pop  <sebastian.pop@amd.com>

	PR tree-optimization/34635
	* tree-data-ref.c (add_other_self_distances): Make sure that the
	evolution step is constant.

	* gcc.dg/tree-ssa/pr34635.c: New.
	* gcc.dg/tree-ssa/pr34635-1.c: New.

From-SVN: r131275
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f08d3af6ade5..f5516e75f4c9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-19  Sebastian Pop  <sebastian.pop@amd.com>
+
+	PR tree-optimization/34635
+	* tree-data-ref.c (add_other_self_distances): Make sure that the
+	evolution step is constant.
+
 2008-01-03  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/34608
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c00eb633ae3..ff42813f96b6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-19  Sebastian Pop  <sebastian.pop@amd.com>
+
+	PR tree-optimization/34635
+	* gcc.dg/tree-ssa/pr34635.c: New.
+	* gcc.dg/tree-ssa/pr34635-1.c: New.
+
 2008-01-02  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR middle-end/34562
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr34635-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr34635-1.c
new file mode 100644
index 000000000000..5afc6db27263
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr34635-1.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+void foo(int x[])
+{
+ int i, j;
+
+ for (i = 0; i < 2; i++)
+   for (j = 0; j < 2; j++)
+   {
+     x[i] = x[i+j];
+     x[i] = x[i+j];
+   }
+}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr34635.c b/gcc/testsuite/gcc.dg/tree-ssa/pr34635.c
new file mode 100644
index 000000000000..5b4253cc4f03
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr34635.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+void foo(int x[])
+{
+ int i, j;
+
+ for (i = 0; i < 2; i++)
+   for (j = 0; j < 2; j++)
+   {
+     x[i] = x[i*j];
+     x[i] = x[i*j];
+   }
+}
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 07b311a93fd6..88f6347f777d 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -2818,9 +2818,9 @@ constant_access_functions (const struct data_dependence_relation *ddr)
   return true;
 }
 
-
 /* Helper function for the case where DDR_A and DDR_B are the same
-   multivariate access function.  */
+   multivariate access function with a constant step.  For an example
+   see pr34635-1.c.  */
 
 static void
 add_multivariate_self_dist (struct data_dependence_relation *ddr, tree c_2)
@@ -2890,7 +2890,17 @@ add_other_self_distances (struct data_dependence_relation *ddr)
 		  return;
 		}
 
-	      add_multivariate_self_dist (ddr, DR_ACCESS_FN (DDR_A (ddr), 0));
+	      access_fun = DR_ACCESS_FN (DDR_A (ddr), 0);
+
+	      if (TREE_CODE (CHREC_LEFT (access_fun)) == POLYNOMIAL_CHREC)
+		add_multivariate_self_dist (ddr, access_fun);
+	      else
+		/* The evolution step is not constant: it varies in
+		   the outer loop, so this cannot be represented by a
+		   distance vector.  For example in pr34635.c the
+		   evolution is {0, +, {0, +, 4}_1}_2.  */
+		DDR_AFFINE_P (ddr) = false;
+
 	      return;
 	    }