From b15e7bddd650b607dd3a392b738540a861aed2fe Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 25 Sep 2015 22:28:04 +0000 Subject: re PR fortran/67525 (ICE on select type with improper selector) 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. 2015-09-25 Steven G. Kargl PR fortran/67525 * gfortran.dg/pr67525.f90: New test. From-SVN: r228155 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/parse.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8e33a1d..1e3a7a1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +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. + 2015-09-25 Manuel López-Ibáñez PR pretty-print/67567 diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 62bcb61..f8d84de 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -3113,15 +3113,18 @@ match_deferred_characteristics (gfc_typespec * ts) static void check_function_result_typed (void) { - gfc_typespec* ts = &gfc_current_ns->proc_name->result->ts; + gfc_typespec ts; gcc_assert (gfc_current_state () == COMP_FUNCTION); - gcc_assert (ts->type != BT_UNKNOWN); + + if (!gfc_current_ns->proc_name->result) return; + + ts = gfc_current_ns->proc_name->result->ts; /* Check type-parameters, at the moment only CHARACTER lengths possible. */ /* TODO: Extend when KIND type parameters are implemented. */ - if (ts->type == BT_CHARACTER && ts->u.cl && ts->u.cl->length) - gfc_expr_check_typed (ts->u.cl->length, gfc_current_ns, true); + if (ts.type == BT_CHARACTER && ts.u.cl && ts.u.cl->length) + gfc_expr_check_typed (ts.u.cl->length, gfc_current_ns, true); } -- cgit v1.1