diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-25 22:30:26 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-25 22:30:26 +0000 |
| commit | 08a4b795d97af542a4fcd6b4ce0aff57bff1cfdd (patch) | |
| tree | 3de40ae7aed87ff2b134c5eb84e4e1c4f6b68f2e | |
| parent | 8ec43c086d7b329690a68d75325a52342f2286fe (diff) | |
| download | gcc-08a4b795d97af542a4fcd6b4ce0aff57bff1cfdd.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228156 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr67614.f90 | 12 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1e3a7a13e2b..0d39cd8391c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 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/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 59cf03402fe..c4083905776 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); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a98e70164c0..74c0823a5bd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/67614 + * gfortran.dg/pr67614.f90: New test. + +2015-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/67525 * gfortran.dg/pr67525.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr67614.f90 b/gcc/testsuite/gfortran.dg/pr67614.f90 new file mode 100644 index 00000000000..ed07385970d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr67614.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! { dg-options "-std=legacy" } +! PR fortran/67614 +! +program foo + implicit none + integer, pointer :: z + if (null(z)) 10, 20, 30 ! { dg-error "Invalid NULL" } +10 continue +20 continue +30 continue +end program foo |