diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-09-15 14:57:48 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-09-15 14:57:48 +0000 |
| commit | 3e0679c8d4e22f00614a52cbd2b33780f3f1a911 (patch) | |
| tree | 8d885cf64ce2b13a250921c758286cace55da118 /gcc/fortran/resolve.c | |
| parent | da903a1610ba94d9309ab3438bd8a6391a7e77fb (diff) | |
| download | gcc-3e0679c8d4e22f00614a52cbd2b33780f3f1a911.zip gcc-3e0679c8d4e22f00614a52cbd2b33780f3f1a911.tar.gz gcc-3e0679c8d4e22f00614a52cbd2b33780f3f1a911.tar.bz2 | |
re PR fortran/91550 (ICE in do_subscript, at fortran/frontend-passes.c:2652)
2019-09-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/91550
* frontend-passes.c (do_subscript): If step equals
zero, a previuos error has been reported; do nothing
in this case.
* resolve.c (gfc_resolve_iterator): Move error checking
after type conversion.
2019-09-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/91550
* gfortran.dg/do_subscript_6.f90: New test.
From-SVN: r275729
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index c4260bb..ce192bb 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7105,19 +7105,6 @@ gfc_resolve_iterator (gfc_iterator *iter, bool real_ok, bool own_scope) "Step expression in DO loop")) return false; - if (iter->step->expr_type == EXPR_CONSTANT) - { - if ((iter->step->ts.type == BT_INTEGER - && mpz_cmp_ui (iter->step->value.integer, 0) == 0) - || (iter->step->ts.type == BT_REAL - && mpfr_sgn (iter->step->value.real) == 0)) - { - gfc_error ("Step expression in DO loop at %L cannot be zero", - &iter->step->where); - return false; - } - } - /* 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) @@ -7131,6 +7118,19 @@ gfc_resolve_iterator (gfc_iterator *iter, bool real_ok, bool own_scope) || iter->step->ts.type != iter->var->ts.type) gfc_convert_type (iter->step, &iter->var->ts, 1); + if (iter->step->expr_type == EXPR_CONSTANT) + { + if ((iter->step->ts.type == BT_INTEGER + && mpz_cmp_ui (iter->step->value.integer, 0) == 0) + || (iter->step->ts.type == BT_REAL + && mpfr_sgn (iter->step->value.real) == 0)) + { + gfc_error ("Step expression in DO loop at %L cannot be zero", + &iter->step->where); + return false; + } + } + if (iter->start->expr_type == EXPR_CONSTANT && iter->end->expr_type == EXPR_CONSTANT && iter->step->expr_type == EXPR_CONSTANT) |