re PR rtl-optimization/11536 ([strength-reduce] -O2 optimalization produces wrong...

        PR optimization/11536
	* unroll.c (loop_iterations): Do not replace a register holding
	the final value by its equivalent before the loop if it is not
	invariant.

        PR optimization/11536
	* gcc.dg/20030721-1.c: New test.

From-SVN: r69635

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b120c1501eb79800962a76dedf075f854d1f5baa..180fc69f843064a84cc0613fb72b9a1aa68a99ad 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-17  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+        PR optimization/11536
+       * unroll.c (loop_iterations): Do not replace a register holding
+       the final value by its equivalent before the loop if it is not
+       invariant.
+
 2003-07-21  Dave Fluri  <dave.fluri@onlink.net>
 
        * doc/extend.texi: Fixes to spelling, grammar, and diction.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96b04a57764c0887552367016d7f39240eeb836b..1cfa936119506f17560f95b9fff9f00d9602a6de 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+        PR optimization/11536
+       * gcc.dg/20030721-1.c: New test.
+
 2003-07-19  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/11546

diff --git a/gcc/testsuite/gcc.dg/20030721-1.c b/gcc/testsuite/gcc.dg/20030721-1.c
new file mode 100644 (file)
index 0000000..5e8ed0b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20030721-1.c
@@ -0,0 +1,41 @@
+/* { dg-options "-O2" } */
+/* PR optimization/11536 */
+/* Origin: samal@kam.mff.cuni.cz <samal@kam.mff.cuni.cz> */
+/* Testcase by Andrew Pinski <pinskia@physics.uc.edu> */
+
+/* Verify that the loop optimizer doesn't use moving targets
+   to calculate the number of iterations of a loop.  */
+
+extern void abort(void);
+
+void foo(int) __attribute__((__noinline__));
+
+void foo(int i)
+{
+  abort();
+}
+
+int main()
+{
+  int i;
+  int first= 0;
+  int last= 0;
+
+  while (last<3) {
+    last = first;
+
+    while (first<=last) {
+      first++;
+
+      for (i=0;i<3;i++)
+        last++;
+
+      if (last>10)
+        return 0;
+    }
+    
+    foo(first);
+  }
+
+  return 0;
+}

diff --git a/gcc/unroll.c b/gcc/unroll.c
index 62b8152daf46f6fc2de08342034eb41efc87abd1..1c66b13fe780945a9f4a3d44c183c03faaf9cd47 100644 (file)
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -3618,7 +3618,7 @@ loop_iterations (struct loop *loop)
 
          if (find_common_reg_term (temp, reg2))
            initial_value = temp;
-         else
+         else if (loop_invariant_p (loop, reg2))
            {
              /* Find what reg2 is equivalent to.  Hopefully it will
                 either be reg1 or reg1 plus a constant.  Let's ignore