From 2d2de608f89e9e753457ee7faa2876ac8e93a377 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 25 Sep 2015 22:30:26 +0000 Subject: re PR fortran/67614 (ICE on using arithmetic if with null) 2015-09-25 Steven G. Kargl PR fortran/67614 * resolve.c (gfc_resolve_code): Prevent ICE for invalid EXPR_NULL. 2015-09-25 Steven G. Kargl PR fortran/67614 * gfortran.dg/pr67614.f90: New test. From-SVN: r228156 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/resolve.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1e3a7a1..0d39cd8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2015-09-25 Steven G. Kargl + PR fortran/67614 + * resolve.c (gfc_resolve_code): Prevent ICE for invalid EXPR_NULL. + +2015-09-25 Steven G. Kargl + PR fortran/67525 * parse.c (match_deferred_characteristics): Remove an assert, which allows an invalid SELECT TYPE selector to be detected. 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); -- cgit v1.1