re PR fortran/51302 (ICE with VOLATILE loop variable)

2011-11-25  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51302
        * trans-stmt.c (gfc_trans_simple_do): Add a fold_convert.

2011-11-25  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51302
        * gfortran.dg/volatile13.f90: New.

From-SVN: r181724

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 18318421159ce860a6b32eacbbd5c25def9f3cbe..22d0fa4b8f4c48de5fe33ba62c583ea6f44c0574 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-25  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/51302
+       * trans-stmt.c (gfc_trans_simple_do): Add a fold_convert.
+
 2011-11-24  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/51218

diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 0d793f96858c71bc176fecef5bc1c63198bb8107..b21be45a96d6e207fad78a0e61ceee6a26a858db 100644 (file)
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -1259,7 +1259,8 @@ gfc_trans_simple_do (gfc_code * code, stmtblock_t *pblock, tree dovar,
   loc = code->ext.iterator->start->where.lb->location;
 
   /* Initialize the DO variable: dovar = from.  */
-  gfc_add_modify_loc (loc, pblock, dovar, from);
+  gfc_add_modify_loc (loc, pblock, dovar,
+                     fold_convert (TREE_TYPE(dovar), from));
   
   /* Save value for do-tinkering checking. */
   if (gfc_option.rtcheck & GFC_RTCHECK_DO)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ff60be03561954cdf9b98fdc599656adc37c9413..6ea8225d3db6836ce6c3e90a1b08829c66d8debd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-25  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/51302
+       * gfortran.dg/volatile13.f90: New.
+
 2011-11-24  Andrew MacLeod  <amacleod@redhat.com>
 
        PR c/51256

diff --git a/gcc/testsuite/gfortran.dg/volatile13.f90 b/gcc/testsuite/gfortran.dg/volatile13.f90
new file mode 100644 (file)
index 0000000..b933222
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/volatile13.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+!
+! PR fortran/51302
+!
+! Volatile DO variable - was ICEing before
+!
+integer, volatile :: i
+integer :: n = 1
+do i = 1, n
+end do
+end