From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 4CC713857BA4; Sat, 28 Jan 2023 21:45:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CC713857BA4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674942320; bh=Ze5kTF8cJ5/Q65qcNBxv6EFqEgC4Ku73ATBUAPIPkVM=; h=From:To:Subject:Date:From; b=N+d+qdXc00zJkeONEyG7PFvegj3bG0/NDYtrDzis6YuBJgkKAAaCJ1Tt0jTAPQUgW YlHVJkZsrpDk/SIO9T49rvi4IAFAf8XcJ6Jh0Wy3js39r8cqPPawCrI/KxjWSogItl mLnKR2Uf8dox5MsJKPELQ2IhjFGj+Iqo34QeuCwU= 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 r12-9078] Fortran: fix ICE in get_expr_storage_size [PR108421] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 523ee9f5994961b27c61d46b27dbe064f68d0d76 X-Git-Newrev: 0e4c239ebde0a926832e3bcaae707eabf81927ff Message-Id: <20230128214520.4CC713857BA4@sourceware.org> Date: Sat, 28 Jan 2023 21:45:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0e4c239ebde0a926832e3bcaae707eabf81927ff commit r12-9078-g0e4c239ebde0a926832e3bcaae707eabf81927ff Author: Harald Anlauf Date: Mon Jan 16 21:30:56 2023 +0100 Fortran: fix ICE in get_expr_storage_size [PR108421] gcc/fortran/ChangeLog: PR fortran/108421 * interface.cc (get_expr_storage_size): Check that we actually have an integer value before trying to extract it with mpz_get_si. gcc/testsuite/ChangeLog: PR fortran/108421 * gfortran.dg/pr108421.f90: New test. (cherry picked from commit a75760374ee54768e5fd6a27080698bfbbd041ab) Diff: --- gcc/fortran/interface.cc | 3 ++- gcc/testsuite/gfortran.dg/pr108421.f90 | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index 54847301aaa..fc23bb70193 100644 --- a/gcc/fortran/interface.cc +++ b/gcc/fortran/interface.cc @@ -2843,7 +2843,8 @@ get_expr_storage_size (gfc_expr *e) if (e->ts.type == BT_CHARACTER) { if (e->ts.u.cl && e->ts.u.cl->length - && e->ts.u.cl->length->expr_type == EXPR_CONSTANT) + && e->ts.u.cl->length->expr_type == EXPR_CONSTANT + && e->ts.u.cl->length->ts.type == BT_INTEGER) strlen = mpz_get_si (e->ts.u.cl->length->value.integer); else if (e->expr_type == EXPR_CONSTANT && (e->ts.u.cl == NULL || e->ts.u.cl->length == NULL)) diff --git a/gcc/testsuite/gfortran.dg/pr108421.f90 b/gcc/testsuite/gfortran.dg/pr108421.f90 new file mode 100644 index 00000000000..89439bc7eec --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr108421.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/108421 +! Contributed by G.Steinmetz + +program p + character(real(3)) :: c ! { dg-error "must be of INTEGER type" } + call s(c) +end +subroutine s(x) + character(*) :: x +end