diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr71799.f90 | 10 |
4 files changed, 24 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a5c2968..752fb02 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-07-28 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/71799 + * resolve.c(gfc_resolve_iterator): Failure of type conversion need + not ICE. + +2016-07-28 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/71859 * check.c(numeric_check): Prevent ICE. Issue error for invalid subroutine as an actual argument when numeric argument is expected. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 1fc540a..23da9ac 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6515,15 +6515,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 1bfcdeb..fc764c9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-07-28 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/71799 + * gfortran.dg/pr71799.f90: New test. + 2016-07-28 Paolo Carlini <paolo.carlini@oracle.com> PR c++/71665 diff --git a/gcc/testsuite/gfortran.dg/pr71799.f90 b/gcc/testsuite/gfortran.dg/pr71799.f90 new file mode 100644 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 |