From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id A6CEE3858436; Wed, 22 Mar 2023 18:30:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6CEE3858436 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=1679509823; i=anlauf@gmx.de; bh=vTGwXlXEqe4LE3P3oBdJ6YgRvBBmFSrtyqKkKRYJOp4=; h=X-UI-Sender-Class:From:To:Subject:Date; b=K2xFTG4rpu9EVby8B5TCd7eaFpId4gA19NX0fKcKJ9OJN2naDh0Sti5lUT0+YIisJ cCVeaqgK3ZsBlyWfR+5wBhkXA1PgyEveYEqaf4ldWIwKLERyRp6v69YeevQ4M0VyPK QTNB4iaWOwmoQd9IpPgzQD/P5HydUMQ/RO803/c+Cj+lj1Bh1LrvLXdw2nd6SL0BDv gr1GAYuNG2Bwh2EK/ZdWA+BM4PfFniWokY8mRvhc+n2uoMCnN6eS/XnkaBqo1vutM2 Kr9wKAKgf5SZ9WZTAPc3pfOpZVEVvdWUPVpL/fikmeUTpR+B+Ho514kGA1D1gija4e om+H3p+ghp0cg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.81.6] ([93.207.81.6]) by web-mail.gmx.net (3c-app-gmx-bap55.server.lan [172.19.172.125]) (via HTTP); Wed, 22 Mar 2023 19:30:23 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: improve checking of FINAL subroutine arguments [PR104572] Content-Type: multipart/mixed; boundary=abmob-fc4383f7-5cbd-450e-ae94-34b5c482fb3c Date: Wed, 22 Mar 2023 19:30:23 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:k4k7zSxG4zlbkbhNgbAyjNeWvmmHHEIQS9vYeWDIA6PWxBxssHBICL3sONsxaZJz5x6L3 IuCRkIgDAeLv0KT+eOSH9/TEHkPX6/YeeLy/kCxhs3acGlix82EYwp9JjZwGjjHPmci/hl+hbInr 4Fd5ZBTgj8Gt2Sow1d9j5asif2ajLPF6SJJW6h5WXFrfmirK4LarQhp5t+kplCIwx25KVArPJLUE MZ4DoyZOTkbDmrGRk60qaF7i2yEUlkKBhMvrnTRNoHq9nzefkk8TYOi8E9M3IdI/hJ5stIzU0rG8 ek= UI-OutboundReport: notjunk:1;M01:P0:TKA8CtEdHus=;gRPGkTtVZjdYh1zA8vXMHDpC+L0 sfcKCXetb1OY4EBERJDb/PBqjB6ceRDulRqVTEaWyGKsKizixnk4whHg+jCxmvM8DsW6eyG6Q Dl6LKYkC3h7zLk/KdKWtmFqHV6c2eN7nKq5iVkStdWU6B/ORS8Zxq7CrjlDdGX9bzqp8v7xhQ Sfj2U6mGsffW6kAV+YcoqbIVqKVUMlKwQ8fkvQkc5j9bTn6BRUIjLOwL5rrHU4xYWVWWFY4xP WJ6HgGyhymXARdXYqOxFGR6bUBcJOSWMRkQS91R077VQIB2ZZvOJ+YwPrRE9Gm57SJPcisz0+ 4s6eYMWxHRYMZWBbgV9jrHB+uw/oTjA5eZd/h4Wd5sSVGLI5EtOinc3VSYWfh4zUWN0KS0UCx jf61bdWK5EybuYwREMqu7zkxdvZc791iOItx+KD6t1k6in8eDehuA3l2q3Xb9sp7iK7XmFSst 8m/mZgJiojAsb5NcfwfJ/3B588AnwoAzUZsY2TewjIv+yMtiJBPksfAbgBiWhcRcT8vMLgEgQ fZxT0iAo/AWNXaJeK85tCzvj1FJ2NVZrbmKlsbUyNR49Z+jm3hFP9mdLv2dqWVas+20X9H2zs wC+KL0dereke0SyxhcrL//XlvQM4/wOycF2OIT+0D719DnfVQiUeUGw20E4tMymt1qPD7sK5T jfu5ayoRv3Zo3N9SgzctMVeog6fDWzVsoO3cyjOH1NGy5gODIQC5MkoxODB6moxRJmHoo8C3l NANJc04tXSY31YGgabokDf72dTbqq/92e+LPWzcgL0uzJDgYrfAfaml0RdKZVXWda3oSlQ1aI KvzB8seNL5Sgez60X0iTPG9V2E+fmSeWK9HiItzAs2Xig= 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: --abmob-fc4383f7-5cbd-450e-ae94-34b5c482fb3c Content-Type: text/plain; charset=UTF-8 Dear all, I've committed the attached simple patch after discussion with Steve (see PR). We need to reject alternate return arguments of FINAL subroutines. Regtested on x86_64-pc-linux-gnu. Thanks, Harald --abmob-fc4383f7-5cbd-450e-ae94-34b5c482fb3c Content-Type: text/x-patch Content-Disposition: attachment; filename=pr104572.diff Content-Transfer-Encoding: quoted-printable =46rom 3e791f45ded89626bc1f9f8013728f6e035801b2 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 22 Mar 2023 19:20:41 +0100 Subject: [PATCH] Fortran: improve checking of FINAL subroutine arguments [PR104572] gcc/fortran/ChangeLog: PR fortran/104572 * resolve.cc (gfc_resolve_finalizers): Argument of a FINAL subroutine cannot be an alternate return. gcc/testsuite/ChangeLog: PR fortran/104572 * gfortran.dg/pr104572.f90: New test. Co-authored-by: Steven G. Kargl =2D-- gcc/fortran/resolve.cc | 7 +++++++ gcc/testsuite/gfortran.dg/pr104572.f90 | 14 ++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr104572.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 1a03e458d99..f6ec76acb0b 100644 =2D-- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -13986,6 +13986,13 @@ gfc_resolve_finalizers (gfc_symbol* derived, bool= *finalizable) } arg =3D dummy_args->sym; + if (!arg) + { + gfc_error ("Argument of FINAL procedure at %L must be of type %qs", + &list->proc_sym->declared_at, derived->name); + goto error; + } + if (arg->as && arg->as->type =3D=3D AS_ASSUMED_RANK && ((list !=3D derived->f2k_derived->finalizers) || list->next)) { diff --git a/gcc/testsuite/gfortran.dg/pr104572.f90 b/gcc/testsuite/gfortr= an.dg/pr104572.f90 new file mode 100644 index 00000000000..59fd688d798 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104572.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! { dg-additional-options "-w" } +! PR fortran/104572 - ICE in gfc_resolve_finalizers +! Contributed by G. Steinmetz + +module m + type t + contains + final :: s + end type +contains + subroutine s(*) ! { dg-error "Argument of FINAL procedure" } + end +end =2D- 2.35.3 --abmob-fc4383f7-5cbd-450e-ae94-34b5c482fb3c--