* trans-stmt.c (gfc_trans_do): Add a few missing folds.

From-SVN: r150969

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3a8dd03c8f127dd72023be619f1adff163b63539..6fde5a48b73966d5021b43681f38e239bea7ff8a 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-20  Tobias Schlüter  <tobi@gcc.gnu.org>
+
+       * trans-stmt.c (gfc_trans_do): Add a few missing folds.
+
 2009-08-20  Michael Matz  <matz@suse.de>
 
        PR fortran/41126

diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 66aecb195200cfc4586ae0cca4ef9790d13fe17f..1ae841f0971e1f9afef8299e8612c30e9206957b 100644 (file)
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -1017,8 +1017,8 @@ gfc_trans_do (gfc_code * code)
       tmp = fold_convert (utype, tmp);
       tmp = fold_build2 (TRUNC_DIV_EXPR, utype, tmp,
                         fold_convert (utype, step));
-      tmp = build2 (MODIFY_EXPR, void_type_node, countm1, tmp);
-      pos = build2 (COMPOUND_EXPR, void_type_node, pos, tmp);
+      tmp = fold_build2 (MODIFY_EXPR, void_type_node, countm1, tmp);
+      pos = fold_build2 (COMPOUND_EXPR, void_type_node, pos, tmp);
 
       tmp = fold_build2 (GT_EXPR, boolean_type_node, to, from);
       neg = fold_build3 (COND_EXPR, void_type_node, tmp,
@@ -1029,8 +1029,8 @@ gfc_trans_do (gfc_code * code)
       tmp = fold_build2 (TRUNC_DIV_EXPR, utype, tmp,
                         fold_convert (utype, fold_build1 (NEGATE_EXPR,
                                                           type, step)));
-      tmp = build2 (MODIFY_EXPR, void_type_node, countm1, tmp);
-      neg = build2 (COMPOUND_EXPR, void_type_node, neg, tmp);
+      tmp = fold_build2 (MODIFY_EXPR, void_type_node, countm1, tmp);
+      neg = fold_build2 (COMPOUND_EXPR, void_type_node, neg, tmp);
 
       tmp = fold_build3 (COND_EXPR, void_type_node, pos_step, pos, neg);
       gfc_add_expr_to_block (&block, tmp);