From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id EC9FA3858028; Sat, 4 Feb 2023 15:43:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC9FA3858028 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675525396; bh=12NiSfpcIqK1QqQq6EO7dcFnmgCt2CBQGaZOuR5bJcY=; h=From:To:Subject:Date:From; b=mr37sUT/mbZm77CoogbxxNMWVrVt91Qpmge0jW/FnlD+DQkI8pRtbRelh7s2SlwvA KcFeK1Pz+Za0xPYcwjDopROH+2ip2rUFTP845P8NLvBYSi8HIo+Th82rooRbUyLhom bWVHCAu7MrbVlZoGDylNYiCumXzzfyYi6+AEbfJU= 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-10502] 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-11 X-Git-Oldrev: c3985fd624053502b0aad85132982b4f8970811a X-Git-Newrev: 2235737a967c9eeabe7b02ffb014d8efef3276af Message-Id: <20230204154316.EC9FA3858028@sourceware.org> Date: Sat, 4 Feb 2023 15:43:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2235737a967c9eeabe7b02ffb014d8efef3276af commit r11-10502-g2235737a967c9eeabe7b02ffb014d8efef3276af 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.c (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.c | 3 ++- gcc/testsuite/gfortran.dg/pr108421.f90 | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index bcc835513d4..efb1257fac2 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2811,7 +2811,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