From patchwork Fri Jun 4 21:12:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1488113 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=wH4LHQOq; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 4Fxb8l5jbyz9s5R for ; Sat, 5 Jun 2021 07:13:27 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D93639A1828 for ; Fri, 4 Jun 2021 21:13:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D93639A1828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1622841205; bh=4MjkAKHCfIRQ2QTgx321qioJSELb4gcaZZAThBvroL8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wH4LHQOqyYEQfVAoKPZtoD/4hAI5wyfXPfGXeI6ck1VXJdNkaZe449iNqnPwbi1n7 x84U07L1tr6c0l8BrQqWxfDkLSbIJRoPF0uD0TqcQ4QgV/FKvLf8h446haL2BEfN3W 2dcS6BhTDqZtEQJTN79x2mCBNK9u+DtpDHqBVcCc= 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.22]) by sourceware.org (Postfix) with ESMTPS id CA28A385781B; Fri, 4 Jun 2021 21:12:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA28A385781B X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.80.92] ([93.207.80.92]) by web-mail.gmx.net (3c-app-gmx-bap18.server.lan [172.19.172.88]) (via HTTP); Fri, 4 Jun 2021 23:12:22 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/95502 - ICE in gfc_check_do_variable, at fortran/parse.c:4446 Date: Fri, 4 Jun 2021 23:12:22 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:zMM7ZxmPzec+10UU3Wuqb0sy6pOjEpiGMbUR0SPqSg90Ne+1+dGK9qQWbVtBsibARFWEf swflUFD+mh3hZPOQAonFOuFEM1VP4Um/IbI86memSpVWYB4wAd1Lr9mg/sS6UFeJIy/wtrrOXe7i SW6N1hmEYgCR/dhOfN8/QD8VgIJadalcQO/bqN8fH2Ob4BD1yodFy5puzbax0MNQtS2pvMKrF7N8 Hf1d4XUymJuPU3/JAV6nbUv47aQu19YP0ajOSd0a1sF//WrNYSgPuEsFpnZtSnzzSKMpGAwWDUrP 9w= X-UI-Out-Filterresults: notjunk:1;V03:K0:KmABHAhAwWE=:V1RrL45p/nA1UKpBKxoAzd MNEjBbq0cT/Om8xvsWDOYoioD3m7DcM/qcWXjanRrTx6GHNnG0M9OOq2B8S/EbtyL+Cb4WB/F iJIzUqZPQ3zQ7JaAHMEZyk0RT1prfstpHtgkwFSh8XpQCosQgG4remf2p4ihWRPJx5GM0QiW4 TLATJr5hrfQdESpsxgDDlG2CQS1lnlXmyNcpzv1qmevUERiR/8K9wiX3S6MZEhJ9sNjBatcqa oqjv8QT2HJh15a9yzRn65i4CEZzzru/+Tp+KRXcXiEHcoGZm8SU80OuyPhI82pGZJBjrRQSiI SplP/jca6G/mqx2O1//pFt70uL/DWD2N8N8Slqwaz7heCqMLLM8kwPkvVvkNXlmZu8UFw1P4v uvNoijM79FD23DZ0k/ucptaukj3p2k+oFM12qglD5iBuuIni+EDF1O4edqwp7vgBNPHo+ITFD D/9Equ6v4e3frW0Gqz6pOPzWhr2/x3Xg/VFY6LJAm+2LdVpl7kIEP7T2iUP73OEvFP7oFe9ID AK2qdImRTO3bTjnfCCsZ1OaFGRr3Zt/cBOuQXJ92KCOqmLTk9z5SfxuPDtmwvqEqu3K7HEzER 8Zph/ojz/T9sXJ4i1cQwyAdQEg6a5sw0+4QjnD4ZN+TE106wI8h+oXjPmd+MwhR31gTfp2uaE UPdobZdAbkX+ahFZAQAD578u/lFRNnG/hajNiYNme0Qv5Z66HMdb7A5QPlP9hq2rCRhn/YB7o f1a8a1XpWdmjK7Lh2GsVNj4c/My2PZFw1DDs14WVPD7QDPFmliO/u27DMUbP0iC+MAHJrkcFq UuM8avFltHSMmiGQ4veseevqrZE8Q== X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" ICE-on-invalid issues during error recovery. Testcase by Gerhard, initial patch by Steve. I found another variant which needed an additional fix for a NULL pointer dereference. Regtested on x86_64-pc-linux-gnu. OK for mainline / 11-branch? Thanks, Harald Fortran - ICE in gfc_check_do_variable, at fortran/parse.c:4446 Avoid NULL pointer dereferences during error recovery. gcc/fortran/ChangeLog: PR fortran/95502 * expr.c (gfc_check_pointer_assign): Avoid NULL pointer dereference. * match.c (gfc_match_pointer_assignment): Likewise. * parse.c (gfc_check_do_variable): Avoid comparison with NULL symtree. gcc/testsuite/ChangeLog: PR fortran/95502 * gfortran.dg/pr95502.f90: New test. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 956003ec605..b11ae7ce5c5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3815,6 +3815,9 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue, int proc_pointer; bool same_rank; + if (!lvalue->symtree) + return false; + lhs_attr = gfc_expr_attr (lvalue); if (lvalue->ts.type == BT_UNKNOWN && !lhs_attr.proc_pointer) { diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 29462013038..d148de3e3b5 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -1409,7 +1409,7 @@ gfc_match_pointer_assignment (void) gfc_matching_procptr_assignment = 0; m = gfc_match (" %v =>", &lvalue); - if (m != MATCH_YES) + if (m != MATCH_YES || !lvalue->symtree) { m = MATCH_NO; goto cleanup; diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 0522b391393..6d7845e8517 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -4588,6 +4588,9 @@ gfc_check_do_variable (gfc_symtree *st) { gfc_state_data *s; + if (!st) + return 0; + for (s=gfc_state_stack; s; s = s->previous) if (s->do_variable == st) { diff --git a/gcc/testsuite/gfortran.dg/pr95502.f90 b/gcc/testsuite/gfortran.dg/pr95502.f90 new file mode 100644 index 00000000000..d40fd9a5508 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr95502.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/95502 - ICE in gfc_check_do_variable, at fortran/parse.c:4446 + +program p + integer, pointer :: z + nullify (z%kind) ! { dg-error "in variable definition context" } + z%kind => NULL() ! { dg-error "constant expression" } +end