aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/io.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2018-12-11 23:13:19 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2018-12-11 23:13:19 +0000
commit3d07fb21d2aaf83548efc4f7ca42fc9deb4028b6 (patch)
tree9d1f2cbf8af8c12e601d7acd76e402e6e4c9d88b /gcc/fortran/io.c
parent3b31a906085899ffea090ef9945ffda785dcad78 (diff)
downloadgcc-3d07fb21d2aaf83548efc4f7ca42fc9deb4028b6.zip
gcc-3d07fb21d2aaf83548efc4f7ca42fc9deb4028b6.tar.gz
gcc-3d07fb21d2aaf83548efc4f7ca42fc9deb4028b6.tar.bz2
re PR fortran/88249 (ICE in gfc_resolve_filepos, at fortran/io.c:2853)
2018-12-11 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/88249 * gfortran.h: Update prototype for gfc_resolve_filepos(). * io.c (gfc_resolve_filepos): Check for UNIT number if ERR= is present. Use passed in locus for error message. * resolve.c (gfc_resolve_code): Pass locus in gfc_resolve_filepos() call. 2018-12-11 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/88249 * gfortran.dg/pr88249.f90: New test. From-SVN: r267035
Diffstat (limited to 'gcc/fortran/io.c')
-rw-r--r--gcc/fortran/io.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 8415df1..9c3e689 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -2849,22 +2849,21 @@ cleanup:
bool
-gfc_resolve_filepos (gfc_filepos *fp)
+gfc_resolve_filepos (gfc_filepos *fp, locus *where)
{
RESOLVE_TAG (&tag_unit, fp->unit);
RESOLVE_TAG (&tag_iostat, fp->iostat);
RESOLVE_TAG (&tag_iomsg, fp->iomsg);
- if (!gfc_reference_st_label (fp->err, ST_LABEL_TARGET))
- return false;
- if (!fp->unit && (fp->iostat || fp->iomsg))
+ if (!fp->unit && (fp->iostat || fp->iomsg || fp->err))
{
- locus where;
- where = fp->iostat ? fp->iostat->where : fp->iomsg->where;
- gfc_error ("UNIT number missing in statement at %L", &where);
+ gfc_error ("UNIT number missing in statement at %L", where);
return false;
}
+ if (!gfc_reference_st_label (fp->err, ST_LABEL_TARGET))
+ return false;
+
if (fp->unit->expr_type == EXPR_CONSTANT
&& fp->unit->ts.type == BT_INTEGER
&& mpz_sgn (fp->unit->value.integer) < 0)