Fix PR46404: call scev_reset to reset the number of iterations as well.

2010-12-16  Sebastian Pop  <sebastian.pop@amd.com>

	PR tree-optimization/46404
	* graphite-clast-to-gimple.c (gloog): Call scev_reset.

	* gcc.dg/graphite/pr46404-1.c: New.

From-SVN: r167954

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 351bce86add08e08bb99cd4d3c077559551ba35e..287d21efaa9bd3a019b29dcc53ff3caef03d09cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-16  Sebastian Pop  <sebastian.pop@amd.com>
+
+       PR tree-optimization/46404
+       * graphite-clast-to-gimple.c (gloog): Call scev_reset.
+
 2010-12-16  Anatoly Sokolov  <aesok@post.ru>
 
        * config/sh/sh.h (OUTPUT_ADDR_CONST_EXTRA): Remove.

diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index 4894b522e9311f7bbdae1cd9ba6dec5f8028195c..eef5ad16abdb66a879a200067da8dae40c25a38c 100644 (file)
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -1555,7 +1555,7 @@ gloog (scop_p scop, htab_t bb_pbb_mapping)
                   &newivs, newivs_index,
                   bb_pbb_mapping, 1, params_index);
   graphite_verify ();
-  scev_reset_htab ();
+  scev_reset ();
   recompute_all_dominators ();
   graphite_verify ();
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index df48e936b24e57f78a6047ec8f0a11ca7c94c7fe..8cfb516a2abf81df5e136db9ce9bcbc5c0c2496c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-16  Sebastian Pop  <sebastian.pop@amd.com>
+
+       PR tree-optimization/46404
+       * gcc.dg/graphite/pr46404-1.c: New.
+
 2010-12-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR debug/46893

diff --git a/gcc/testsuite/gcc.dg/graphite/pr46404-1.c b/gcc/testsuite/gcc.dg/graphite/pr46404-1.c
new file mode 100644 (file)
index 0000000..c3e620c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr46404-1.c
@@ -0,0 +1,27 @@
+/* { dg-options "-O -fgraphite-identity -fno-tree-scev-cprop" } */
+
+int
+huft_build (unsigned *b)
+{
+  int k;
+  for (k = 0; k <= 10; k++)
+    if (foo ());
+}
+int
+inflate_fixed ()
+{
+  int i;
+  unsigned l[288];
+  for (i = 0; i < 144; i++)
+    l[i] = 8;
+  for (; i < 256; i++)
+    l[i] = 9;
+  for (; i < 280; i++)
+    l[i] = 7;
+  for (; i < 288; i++)
+    l[i] = 8;
+  if ((i = huft_build (l)) != 0)
+    return i;
+  for (i = 0; i < 30; i++)
+    l[i] = 5;
+}