From patchwork Thu Jun 25 20:57:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1317195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=CFZSQ4Jv; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tC576cWXz9sQt for ; Fri, 26 Jun 2020 06:57:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D55DD3870854; Thu, 25 Jun 2020 20:57:24 +0000 (GMT) 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 4472D3851C0D; Thu, 25 Jun 2020 20:57:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4472D3851C0D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=anlauf@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1593118639; bh=gLYcZZ3Xq//rVHGPNCWitMWF6rt6j9K/znUhwtCO9n0=; h=X-UI-Sender-Class:From:To:Subject:Date; b=CFZSQ4JviH1hsqdx4yXvL8A7dI41jIpQPGe+40gsr3OsSLMYk8A97pLrUpsuJIlrj xaGXAnUZzAyh6L7l+s4a6ryiambHbLTj0Q7alhRbXKSrkE5T7s9ITxxhk8peciAfrK 53NXZE85KDECUraYaAsgrJ1e9Vcf9VgVcW/sFdf4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.15.25] ([79.251.15.25]) by web-mail.gmx.net (3c-app-gmx-bs31.server.lan [172.19.170.83]) (via HTTP); Thu, 25 Jun 2020 22:57:19 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] [8/9/10/11 Regression] ICE on invalid with argument list for module procedure Date: Thu, 25 Jun 2020 22:57:19 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:GEpsDd0Myy0fkpEYScAfyt1iLXas7qn3yb/+oSv5MK+PsQb54WCdMuSlWT1WtjVWxP1XC B+g9/E5rcXfTtsXBg+Z6Fp5WOQG6kRtaK1XiK/mFUjCRz5x9dJCMqCTSb0aqkmyEXSFwWCoQcyRz /GMBXyLvIeOUJX7PpGKGUDAQRu2wkdfzxMsv5YDXkYMeyyQRgKpPHv12ozbQDQ1pFJPB7wBtEfWk AxXZ3MQJ1wwNYxJbbTwag0NM0X+IV7MlhCZat1HcpDrFGrtNIAeAw4qa/+Dm5RuT5F6irUKv6ckV Bs= X-UI-Out-Filterresults: notjunk:1;V03:K0:iI68qww/7no=:zhr6fxFCOfxrDX7Ri3AvJ3 QG0P0i9vXJvgtL8C164eKzYZuin40ZwgAPKY8x+W+70RLPldGR6OpcfCAysKrM/lh1ixOAjiG wnBK4YP0migmpFr4w9X6P3obTLUkuQn4zTbVPH6PuMqrAenveuNCtvhEPKt1FitZh54o2j758 dfjoHPMyINutUqlh16l4Hu4e0u5p8udI9hLeBilLYYaiMN1W0x6uvkkiknd1UGT5ny4y+4Bhq 11WGnfF4YJ7OSdTLx2F0GWlfbuRYOawT/X4pKydX8JfpdtA46WdLUR2tV2FkKIp0A2NZnycWR vwqnrzUMCrmKNSpK+u5NdlcH/IoSIToPTA6aPpuZ7OoIG0sOqosxEsJ+AjBzTI5Ry26XfvBiP doE8IOzb9OiigbkLclRTvqNGfw/eL/2lXTTUQUEwZ+S+DvJ9wNTUXHiOoV87LSUZXL4c/eC9z h1pUuoeKNeb8tKONCbbxYYclHV/qp0UgV1R4YhovKaO1XZQL3BQftKihHsz1qpma5EASuENwz NM+VVaKbuKtjCHgv/kqwEyKC5oYcxo9orsMVJjMB8CYvg5vrcFBNeT5PrjU9bZOVOF0poEy34 T96B8uNJ8lJ1J2TkMwOSMX+d/ot27iWws7JCEbfEMZDraE5W+5FJ1bGHWxOxnJ1gmwM8HjRXj +L+Oir0BGlAU/tijEjfKhyn6IxUYLRmrGBdm3Kbb95WulnA== X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" A simple situation where a NULL pointer dereference occurs during error recovery. Regtested on x86_64-pc-linux-gnu. OK for master / backports? Thanks, Harald PR fortran/93423 - ICE on invalid with argument list for module procedure When recovering from an error, a NULL pointer dereference could occur. Check for that situation and punt. gcc/fortran/ PR fortran/93423 * resolve.c (resolve_symbol): Avoid NULL pointer dereference. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 6fa34caec54..c9447a24885 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -15901,7 +15901,7 @@ resolve_symbol (gfc_symbol *sym) if (formal) { sym->formal_ns = formal->sym->ns; - if (sym->ns != formal->sym->ns) + if (sym->ns != formal->sym->ns && sym->formal_ns) sym->formal_ns->refs++; } } diff --git a/gcc/testsuite/gfortran.dg/pr93423.f90 b/gcc/testsuite/gfortran.dg/pr93423.f90 new file mode 100644 index 00000000000..fed5914daba --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93423.f90 @@ -0,0 +1,21 @@ +! { dg-do compile } +! PR fortran/93423 - ICE on invalid with argument list for module procedure + +module t + type :: b + contains + procedure :: p => bp + end type b + interface + module function bp(s) + class(b), intent(inout) :: s + integer, pointer :: bp + end function + end interface +end module t + +submodule (t) ts +contains + module procedure bp(s) ! { dg-error "must be in a generic module interface" } + end procedure bp ! { dg-error "Expecting END SUBMODULE statement" } +end submodule ts