diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-09-25 22:30:26 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-09-25 22:30:26 +0000 |
| commit | 2d2de608f89e9e753457ee7faa2876ac8e93a377 (patch) | |
| tree | 3de40ae7aed87ff2b134c5eb84e4e1c4f6b68f2e /gcc/fortran/resolve.c | |
| parent | b15e7bddd650b607dd3a392b738540a861aed2fe (diff) | |
| download | gcc-2d2de608f89e9e753457ee7faa2876ac8e93a377.zip gcc-2d2de608f89e9e753457ee7faa2876ac8e93a377.tar.gz gcc-2d2de608f89e9e753457ee7faa2876ac8e93a377.tar.bz2 | |
re PR fortran/67614 (ICE on using arithmetic if with null)
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67614
* resolve.c (gfc_resolve_code): Prevent ICE for invalid EXPR_NULL.
2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/67614
* gfortran.dg/pr67614.f90: New test.
From-SVN: r228156
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 59cf034..c408390 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -10380,10 +10380,14 @@ gfc_resolve_code (gfc_code *code, gfc_namespace *ns) { gfc_expr *e = code->expr1; + gfc_resolve_expr (e); + if (e->expr_type == EXPR_NULL) + gfc_error ("Invalid NULL at %L", &e->where); + if (t && (e->rank > 0 || !(e->ts.type == BT_REAL || e->ts.type == BT_INTEGER))) gfc_error ("Arithmetic IF statement at %L requires a scalar " - "REAL or INTEGER expression", &code->expr1->where); + "REAL or INTEGER expression", &e->where); resolve_branch (code->label1, code); resolve_branch (code->label2, code); |