aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2011-11-25 16:18:06 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2011-11-25 16:18:06 +0100
commit8594f636ac2b823bcdd6e34afb4588013b330da7 (patch)
tree8e790d3183a0d3e288b5c272b931d4e131d712af /gcc
parentd6b1c2dc3d3ebdafb72cdd90efdf0df21523638c (diff)
downloadgcc-8594f636ac2b823bcdd6e34afb4588013b330da7.zip
gcc-8594f636ac2b823bcdd6e34afb4588013b330da7.tar.gz
gcc-8594f636ac2b823bcdd6e34afb4588013b330da7.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-stmt.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/volatile13.f9011
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1831842..22d0fa4 100644
--- 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 0d793f9..b21be45 100644
--- 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 ff60be0..6ea8225 100644
--- 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
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