From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id CA6D53858D28; Sun, 5 Mar 2023 19:35:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA6D53858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678044936; bh=gEpLruMIOJpT/Rc2ni48g5sNUhvPgd+y6iG5otCK+KY=; h=From:To:Subject:Date:From; b=d55RMPRzso26lb6RKWgpqy0eSEdNpPGCKObC56nYUNG2+c4TvdVTahOJwvPi3w5wR 8WaLLpifggQQUNNp2VdHV09KbsO0+WMPKbbjGwXotcfDut3HMtEiWV3esCCmT8ZKd/ ROiU0iaZRMSFbfHuWil2MVMRXU0Etepg9Z3KybJc= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10558] Fortran: improve checking of character length specification [PR96025] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 6edf2ae1e7b0a7f2151b9af9db6a96ae701869b9 X-Git-Newrev: 8412f78621f6dcb7cee23dda49afb28299d8083b Message-Id: <20230305193536.CA6D53858D28@sourceware.org> Date: Sun, 5 Mar 2023 19:35:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8412f78621f6dcb7cee23dda49afb28299d8083b commit r11-10558-g8412f78621f6dcb7cee23dda49afb28299d8083b Author: Harald Anlauf Date: Mon Feb 20 21:28:09 2023 +0100 Fortran: improve checking of character length specification [PR96025] gcc/fortran/ChangeLog: PR fortran/96025 * parse.c (check_function_result_typed): Improve type check of specification expression for character length and return status. (parse_spec): Use status from above. * resolve.c (resolve_fntype): Prevent use of invalid specification expression for character length. gcc/testsuite/ChangeLog: PR fortran/96025 * gfortran.dg/pr96025.f90: New test. (cherry picked from commit 6c1b825b3d6499dfeacf7c79dcf4b56a393ac204) Diff: --- gcc/fortran/parse.c | 25 ++++++++++++++----------- gcc/fortran/resolve.c | 4 +++- gcc/testsuite/gfortran.dg/pr96025.f90 | 11 +++++++++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 04501f44ef8..23602446b61 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -3747,21 +3747,30 @@ match_deferred_characteristics (gfc_typespec * ts) For return types specified in a FUNCTION prefix, the IMPLICIT rules of the scope are not yet parsed so this has to be delayed up to parse_spec. */ -static void +static bool check_function_result_typed (void) { gfc_typespec ts; gcc_assert (gfc_current_state () == COMP_FUNCTION); - if (!gfc_current_ns->proc_name->result) return; + if (!gfc_current_ns->proc_name->result) + return true; 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); + { + /* Reject invalid type of specification expression for length. */ + if (ts.u.cl->length->ts.type != BT_INTEGER) + return false; + + gfc_expr_check_typed (ts.u.cl->length, gfc_current_ns, true); + } + + return true; } @@ -3869,10 +3878,7 @@ loop: } if (verify_now) - { - check_function_result_typed (); - function_result_typed = true; - } + function_result_typed = check_function_result_typed (); } switch (st) @@ -3883,10 +3889,7 @@ loop: case ST_IMPLICIT_NONE: case ST_IMPLICIT: if (!function_result_typed) - { - check_function_result_typed (); - function_result_typed = true; - } + function_result_typed = check_function_result_typed (); goto declSt; case ST_FORMAT: diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 3005619c463..29125694e1e 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -17260,7 +17260,9 @@ resolve_fntype (gfc_namespace *ns) } } - if (sym->ts.type == BT_CHARACTER) + if (sym->ts.type == BT_CHARACTER + && sym->ts.u.cl->length + && sym->ts.u.cl->length->ts.type == BT_INTEGER) gfc_traverse_expr (sym->ts.u.cl->length, sym, flag_fn_result_spec, 0); } diff --git a/gcc/testsuite/gfortran.dg/pr96025.f90 b/gcc/testsuite/gfortran.dg/pr96025.f90 new file mode 100644 index 00000000000..ce292bd9664 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr96025.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/96025 - ICE in expr_check_typed_help +! Contributed by G.Steinmetz + +program p + print *, f() +contains + character(char(1)) function f() ! { dg-error "must be of INTEGER type" } + f = 'f' + end +end