From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 1A8F1396DC39; Wed, 16 Nov 2022 21:58:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A8F1396DC39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1668635898; bh=+3Lid6/IkBXA3pT2tQzc01pwo73Kcl9ffIqj5UhKSxo=; h=X-UI-Sender-Class:From:To:Subject:Date; b=cAvnsr7P2oPwjgZ7Z7eOSHvNKDVJNIJkncS2dCufP8q+6+s11umOTqt7T3mhH6jR8 BkfGBmapU0cbMORJRnYUciGffipWHxSClhmBfywQo4YxYTLr6ft75Q1Zkw7ht9mjlK vL/XkqwAq93Q1f1p7MLQDdlcJLBR8F//Nqmlib6f1PA6q5BAzv1kYkR83q/8tHPqbI 7bivwULhOwoJbHL8NWNllg2W+iDkSf+b/Lr/7XmGqVjNJ90THz8+yk0v9IUQ8o6h5i kqxM/8pJvpRJG7pDCzjpNnlYLj5PI78ojr5UttLM71DdxpHVJ2KkEQO/N4GFlDWlcd kXmPGwehT8qrA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.86.187] ([93.207.86.187]) by web-mail.gmx.net (3c-app-gmx-bap19.server.lan [172.19.172.89]) (via HTTP); Wed, 16 Nov 2022 22:58:18 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: ICE on procedure arguments with non-integer length [PR107707] Content-Type: multipart/mixed; boundary=rekceb-421f17b0-cbdb-4fa9-97fb-737922d1a2e3 Date: Wed, 16 Nov 2022 22:58:18 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:hiN9ygfQpiFskFnwN0hArvu2VL3xcivwkFTFNh2nQhtcXASSCXAyZawrEhIi+UTh3CAUb wx+lXtrTNzVWUOkOUqe9OpLs4mLOREjZCbdOLclSh0q2+WgrFTvy3aGB3nAoDXtJ0xdFljtMfRNP acjKNr4J891i0Q73SY4dFmYY/d8CEqj2N5Z086VfErs8jv26x6EXI8rAnLbAvcUhUT/Txl/shsTV lO2A6naAGHxGiXw4/5gLxFpfN5nlJlUvT3kobRFRIb/RsBZo+rsIokja+OpywdZH2eqE041xIzJJ 3o= UI-OutboundReport: notjunk:1;M01:P0:IiwG5SlWJlg=;Gxa3jshZ2uhWkuYmi2gpx4r2UY/ AI2MHSRCe/5x2C/Of6gruj4I6EKbmrQ470MKLzKm1vL8wRQqDu87uLeAnAMnTLl22bBdq5OSR 80gFbGasqFxB6IAlUEvEjA6kuSBx99v+ywUHsbVQ5+ZMyV8X07ShyMiW9lUByQQ1O7MfbDGxb y9Z4FtJcoF68p+ade1hg6agzXKevxlZ9vGwDLTBGL84w1G6d/tK5ATTTs5/2CeBeoimxy5t1V 6d1ZXy/Kv28dvD+UTA3zM+08XH9hi0qblbwBntjlipr7uFPdYcakOwj/hKZptiCVj9sOvgHRS VdJBf2ou/iwPY8uwOzWLKY5b/7rMxVoRzKUQRZLPByP3Mjmk3jp7HpLiECHKR9r0VpDcirWky DufqRWzLLxSSbAQHFgqUdg+wU2n4wYlJtNTlkNc9n2NkA97NHHE1j4lmuTm4gc+C3BzxR9ewB E9C0BOMNRDvhDLhoYpFantWAvmPmrIBJZYo5Zl16TOJUk2y//ZLcHOmu9Q6cSfVcxeR4iKaph uWcvlDl/XUSvljilcH6RDP/grnx5pdw6Dqz5tzwyagHS9RTg6s0SvJY+Q/zTpS3E4fFDJnQak /cMcpr8Gdykfss3a2xBFtV8RBRdjew8sWG2ZzKNNUPMMDkcEhvr6HW3+CDH+TCF0ltCfGrDdq b1VbqYqx2e/A9w6s6njqsLKW6FYMBPDQrQy+cWstRgEZ6fu3Fvtm/mp87EvwXQchNXP57WwWS aSnUCwpGgNm0TbHFv9OquszfqSuaxSVamtmsW6YsuCiy5ukggBWx+9H2HzSrI54TyiN5qOObo CXcp7BgKaF2p2wzcr1M7pS9Q== X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --rekceb-421f17b0-cbdb-4fa9-97fb-737922d1a2e3 Content-Type: text/plain; charset=UTF-8 Dear all, I've committed the attached patch for Steve after regtesting. It obviously checks the types of character length to be integer before passing them to mpz_*. Pushed as r13-4113-gbdd784fc48a283d54f5f1e3cc2a0668c14dd3bee Thanks, Harald @Steve: please close PR if you think everything is ok. --rekceb-421f17b0-cbdb-4fa9-97fb-737922d1a2e3 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr107707.diff Content-Transfer-Encoding: quoted-printable =46rom bdd784fc48a283d54f5f1e3cc2a0668c14dd3bee Mon Sep 17 00:00:00 2001 From: Steve Kargl Date: Wed, 16 Nov 2022 22:46:55 +0100 Subject: [PATCH] Fortran: ICE on procedure arguments with non-integer leng= th [PR107707] gcc/fortran/ChangeLog: PR fortran/107707 * interface.cc (gfc_compare_actual_formal): Check that we actually have integer values before asking gmp_* to use them. gcc/testsuite/ChangeLog: PR fortran/107707 * gfortran.dg/pr107707.f90: New test. =2D-- gcc/fortran/interface.cc | 2 ++ gcc/testsuite/gfortran.dg/pr107707.f90 | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr107707.f90 diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index 49dbd1d886c..616ae2b1197 100644 =2D-- a/gcc/fortran/interface.cc +++ b/gcc/fortran/interface.cc @@ -3273,9 +3273,11 @@ gfc_compare_actual_formal (gfc_actual_arglist **ap,= gfc_formal_arglist *formal, if (a->expr->ts.type =3D=3D BT_CHARACTER && a->expr->ts.u.cl && a->expr->ts.u.cl->length && a->expr->ts.u.cl->length->expr_type =3D=3D EXPR_CONSTANT + && a->expr->ts.u.cl->length->ts.type =3D=3D BT_INTEGER && f->sym->ts.type =3D=3D BT_CHARACTER && f->sym->ts.u.cl && f->sym->ts.u.cl->length && f->sym->ts.u.cl->length->expr_type =3D=3D EXPR_CONSTANT + && f->sym->ts.u.cl->length->ts.type =3D=3D BT_INTEGER && (f->sym->attr.pointer || f->sym->attr.allocatable || (f->sym->as && f->sym->as->type =3D=3D AS_ASSUMED_SHAPE)) && (mpz_cmp (a->expr->ts.u.cl->length->value.integer, diff --git a/gcc/testsuite/gfortran.dg/pr107707.f90 b/gcc/testsuite/gfortr= an.dg/pr107707.f90 new file mode 100644 index 00000000000..a8be2b5b299 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107707.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/107707 - ICE in gfc_compare_actual_formal +! Contributed by G.Steinmetz + +program p + character(3), allocatable :: c + c =3D 'abc' + call s(c) +contains + subroutine s(x) + character(real(3)), allocatable :: x ! { dg-error "must be of INTEGER= type" } + end +end =2D- 2.35.3 --rekceb-421f17b0-cbdb-4fa9-97fb-737922d1a2e3--