From patchwork Mon Mar 20 20:57:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 66657 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92AFD3858002 for ; Mon, 20 Mar 2023 20:58:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92AFD3858002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679345894; bh=EXQjWBB3c9coBivKHfUL3bzMqL168aW6MwA3tLeMSTc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WoadewcUkJ/o+37hkrrnkqoQLYEiXZbcDRVIA51q6PZ65AB178gNFG/7EUhgHS+Jg JBhGwWYWZSvcaiMWJBMavnn1jspqIHPb48Gtpv5Z9gTDAtu8M31+y6MPjc6UUzttQJ uL/PhdmVMgwqNiGFxteQHsqgZdmNl1iQ6zy5w3zQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by sourceware.org (Postfix) with ESMTPS id 2C7C53858D32; Mon, 20 Mar 2023 20:57:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C7C53858D32 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.84.34] ([93.207.84.34]) by web-mail.gmx.net (3c-app-gmx-bap50.server.lan [172.19.172.120]) (via HTTP); Mon, 20 Mar 2023 21:57:44 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: reject MODULE PROCEDURE outside generic module interface [PR99036] Date: Mon, 20 Mar 2023 21:57:44 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:qh/q94+5MW1AbjZMkULnDMqT/0yAs2PQexH3G1Hew668f81LBV2zRBq65E+S4k+9hS4a5 Sz6TBlqX+VfbV1YJTNtdnr757csqhqXlaAesG5tY6qwbjzjuSgrxfDYHR3ocv5y+r9KAwn7whLAs R/Z1TP0sqKXxr8VPQopSM4GEg6B7mR8+x7eCUFia4eDU7oCLTiskGnS6Yra9q3qssXhGf76cDXEY rQgqMqTt6wnaMJT/ozLbG94oJ2mRiIMmnOf72jF790hg4RAsPzczQDzoFgaiI3khKxwkWfVTFDCG V4= UI-OutboundReport: notjunk:1;M01:P0:xN4y2GEQrqY=;+Jd9caIQyHo1rdcbyh6voYDc2k3 BKWOskTZYVzLTNX+CmCyOflcqKJ65nB+Wq5ZIZmdHNNwAV00mew7P2t+c8yUZ3PfUJE68MGBd 3RRGRBjjmCNkwkXMilU786rqiyVVx233KFyFaH8rlKelO6HKGEzkypqeMuX1OnUHgmEBZ3+Dz 2NkHiXQ9mYyWksCDwlMf8g9pH49EPj9EaMC89+dLbFcehjl+dXmuNVzQ5EAkSU21Af2tu3veS TFV/6PpC/7Q7ceM9EY9LoW6XY3PEF2O6WIX5/4TnY4y5e4W3uRZ9DWUDFrjtP61hw3sfHTRr6 MEs4iu5vF+M91JsEUhWl9na8FjN8UtDGNHF2RZp6u4rfItLD1qOx3QR1I+0NatDc1sEBIO8mN iMxP4hy155SlQcOP2PZmkgV3CI8Nd/YJAQsguTIU2PBzp0qvpLsnJPNgRJ8fJiyvDpboFwKIb IIRvB52RYB0YUZrKm6I9gI0Afrz6paCNdvy34masGf/TNg94/ZdtBgwSRlCl6ozXL35cOMnTh EyGqblgUpNZAwDWmqfW/Uve7gdfQZvK2I/Nit4WqnE8xx9KjoSSvtn4DI/QUQ7HQA83wjxRHX 8mvb+3LUxUIfOUorZtt3nmVBH67DWZlRDllToq1D/CDhM51xwjj3+sz0u5/WSTFJ7QZhBT1Ny bssSBCDc63vSPZvTZ9z1fIlITrLg8Pnu7yuaDkix4HpIYCvkO7KKqfxBrj9oxG8YxMbkBXMbZ b7v0MAH2q60BpTe2pHdKp74lLsuEuU+xYZTs5xLr1Qi8n+qkYES3Caf3WePGXNpmXIb4WKRio YMLFpUhuNxzWxTF0Kk9O4XS3C0Rj9w2akyNPVR2Unk2+g= X-Spam-Status: No, score=-12.8 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the attached trivial patch catches a MODULE PROCEDURE outside of a module interface before we run into an internal error. Regtested on x86_64-pc-linux-gnu. OK for mainline? This PR is marked as an 11/12/13 regression, so this is a candidate for backporting. Thanks, Harald From 9c59709fad91c99041a9cb770b98da17af01d260 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 20 Mar 2023 21:50:59 +0100 Subject: [PATCH] Fortran: reject MODULE PROCEDURE outside generic module interface [PR99036] gcc/fortran/ChangeLog: PR fortran/99036 * decl.cc (gfc_match_modproc): Reject MODULE PROCEDURE if not in a generic module interface. gcc/testsuite/ChangeLog: PR fortran/99036 * gfortran.dg/pr99036.f90: New test. --- gcc/fortran/decl.cc | 1 + gcc/testsuite/gfortran.dg/pr99036.f90 | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr99036.f90 diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index c8f0bb83c2c..b29f491fe1f 100644 --- a/gcc/fortran/decl.cc +++ b/gcc/fortran/decl.cc @@ -9998,6 +9998,7 @@ gfc_match_modproc (void) if ((gfc_state_stack->state != COMP_INTERFACE && gfc_state_stack->state != COMP_CONTAINS) || gfc_state_stack->previous == NULL + || !current_interface.type || current_interface.type == INTERFACE_NAMELESS || current_interface.type == INTERFACE_ABSTRACT) { diff --git a/gcc/testsuite/gfortran.dg/pr99036.f90 b/gcc/testsuite/gfortran.dg/pr99036.f90 new file mode 100644 index 00000000000..a6e396f6f71 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr99036.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/99036 - ICE in gfc_current_interface_head +! Contributed by G. Steinmetz + +module m +contains + module procedure s ! { dg-error "must be in a generic module interface" } + end +end -- 2.35.3