re PR rtl-optimization/37782 (Stage2 ada compiler miscompiled)

2008-11-03  Andrew Pinski  <andrew_pinski@playstation.sony.com>

        PR rtl-opt/37782
        * loop-doloop.c (doloop_modify): Add from_mode argument that says what
        mode count is in.
        (doloop_optimize): Update call to doloop_modify.

From-SVN: r141558

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 210135528ec8fb4d05ba28ddfb999a730d8b9acb..caf616a4784f961221cee11a5d206546289be208 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-03  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       PR rtl-opt/37782
+       * loop-doloop.c (doloop_modify): Add from_mode argument that says what
+       mode count is in.
+       (doloop_optimize): Update call to doloop_modify.
+
 2008-11-03  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-sra.c (bitfield_overlaps_p): Fix oversight.

diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index 25369dd4a4d611aa7274b35c27bf96b109955e7e..1f5856f581b24da02f4ffb281e19393c3ddcdecb 100644 (file)
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -335,11 +335,12 @@ add_test (rtx cond, edge *e, basic_block dest)
    end of the loop.  CONDITION is the condition separated from the
    DOLOOP_SEQ.  COUNT is the number of iterations of the LOOP.
    ZERO_EXTEND_P says to zero extend COUNT after the increment of it to
-   word_mode.  */
+   word_mode from FROM_MODE.  */
 
 static void
 doloop_modify (struct loop *loop, struct niter_desc *desc,
-              rtx doloop_seq, rtx condition, rtx count, bool zero_extend_p)
+              rtx doloop_seq, rtx condition, rtx count,
+              bool zero_extend_p, enum machine_mode from_mode)
 {
   rtx counter_reg;
   rtx tmp, noloop = NULL_RTX;
@@ -413,11 +414,11 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
     }
 
   if (increment_count)
-    count = simplify_gen_binary (PLUS, mode, count, const1_rtx);
+    count = simplify_gen_binary (PLUS, from_mode, count, const1_rtx);
 
   if (zero_extend_p)
     count = simplify_gen_unary (ZERO_EXTEND, word_mode,
-                               count, mode);
+                               count, from_mode);
 
   /* Insert initialization of the count register into the loop header.  */
   start_sequence ();
@@ -672,7 +673,8 @@ doloop_optimize (struct loop *loop)
       return false;
     }
 
-  doloop_modify (loop, desc, doloop_seq, condition, count, zero_extend_p);
+  doloop_modify (loop, desc, doloop_seq, condition, count,
+                zero_extend_p, mode);
   return true;
 }