backport: re PR fortran/71799 (ICE in DO loop code emission (gfc_resolve_iterator))

2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>

	Backport from trunk

	PR fortran/71799
	* gfortran.dg/pr71799.f90: New test.

2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>

	Backport from trunk

	PR fortran/71799
	* resolve.c(gfc_resolve_iterator): Failure of type conversion need
	not ICE.

From-SVN: r240668

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index abf854cfab18b17760eb9204f1ea6f22ae18f059..3f0d9267831f56206ca42282d067f8969aba78df 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       Backport from trunk
+
+       PR fortran/71799
+       * resolve.c(gfc_resolve_iterator): Failure of type conversion need
+       not ICE.
+
 2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
  
        Backport from trunk

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 9aacf836c9c01b4252acceba783b652fa70599c9..662c8707efb2cda2c526b7f2d6644070d24ed492 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -6418,15 +6418,15 @@ gfc_resolve_iterator (gfc_iterator *iter, bool real_ok, bool own_scope)
   /* Convert start, end, and step to the same type as var.  */
   if (iter->start->ts.kind != iter->var->ts.kind
       || iter->start->ts.type != iter->var->ts.type)
-    gfc_convert_type (iter->start, &iter->var->ts, 2);
+    gfc_convert_type (iter->start, &iter->var->ts, 1);
 
   if (iter->end->ts.kind != iter->var->ts.kind
       || iter->end->ts.type != iter->var->ts.type)
-    gfc_convert_type (iter->end, &iter->var->ts, 2);
+    gfc_convert_type (iter->end, &iter->var->ts, 1);
 
   if (iter->step->ts.kind != iter->var->ts.kind
       || iter->step->ts.type != iter->var->ts.type)
-    gfc_convert_type (iter->step, &iter->var->ts, 2);
+    gfc_convert_type (iter->step, &iter->var->ts, 1);
 
   if (iter->start->expr_type == EXPR_CONSTANT
       && iter->end->expr_type == EXPR_CONSTANT

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bc22bd8ed4729793437ad63dce3352bdd4f8f6e7..a77db1176edd70f9d05d87a97a7de491355d5957 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       Backport from trunk
+ 
+       PR fortran/71799
+       * gfortran.dg/pr71799.f90: New test.
+
 2016-09-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/testsuite/gfortran.dg/pr71799.f90 b/gcc/testsuite/gfortran.dg/pr71799.f90
new file mode 100644 (file)
index 0000000..32be5f7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr71799.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+subroutine test2(s)
+integer(1) :: i
+integer (8) :: s
+
+do i = 10, HUGE(i) - 10, 222 ! { dg-error "overflow converting" }
+  s = s + 1
+end do
+
+end subroutine test2