diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-12-23 05:18:27 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-12-23 05:18:27 +0000 |
| commit | 0652a1512130cfda8a7ffb192f47bf19c9be2525 (patch) | |
| tree | c8b9de71d19f18e386c81abe1751e200bfdcd8f9 /gcc/fortran/io.c | |
| parent | e2385f4e812bd9f0172e8c28c50c3a51a6fcbcb8 (diff) | |
| download | gcc-0652a1512130cfda8a7ffb192f47bf19c9be2525.zip gcc-0652a1512130cfda8a7ffb192f47bf19c9be2525.tar.gz gcc-0652a1512130cfda8a7ffb192f47bf19c9be2525.tar.bz2 | |
re PR fortran/88328 (ICE in resolve_tag_format, at fortran/io.c:1641)
2018-12-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88328
* io.c (resolve_tag_format): Add error for zero-sized array.
(gfc_resolve_dt): Manipulate gfc_current_locus to get sensible error
message locus.
2018-12-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/88328
* gfortran.dg/pr88328.f90: New test.
From-SVN: r267367
Diffstat (limited to 'gcc/fortran/io.c')
| -rw-r--r-- | gcc/fortran/io.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 9c3e689..541e6ef 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -1636,6 +1636,12 @@ resolve_tag_format (gfc_expr *e) gfc_expr *r; gfc_char_t *dest, *src; + if (e->value.constructor == NULL) + { + gfc_error ("FORMAT tag at %C cannot be a zero-sized array"); + return false; + } + n = 0; c = gfc_constructor_first (e->value.constructor); len = c->expr->value.character.length; @@ -3245,12 +3251,21 @@ gfc_resolve_dt (gfc_dt *dt, locus *loc) { gfc_expr *e; io_kind k; + locus tmp; /* This is set in any case. */ gcc_assert (dt->dt_io_kind); k = dt->dt_io_kind->value.iokind; - RESOLVE_TAG (&tag_format, dt->format_expr); + tmp = gfc_current_locus; + gfc_current_locus = *loc; + if (!resolve_tag (&tag_format, dt->format_expr)) + { + gfc_current_locus = tmp; + return false; + } + gfc_current_locus = tmp; + RESOLVE_TAG (&tag_rec, dt->rec); RESOLVE_TAG (&tag_spos, dt->pos); RESOLVE_TAG (&tag_advance, dt->advance); |