From patchwork Tue May 10 21:51:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 53760 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 1B0FB3948A4E for ; Tue, 10 May 2022 21:52:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B0FB3948A4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652219558; bh=eNQ5pNZBQvN90wFVz8BR8rNxXX4Rs75oAfmCmPacFFM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mlH4ncepYoO1+zNqnYTCVrHb6NF5fhTgDnan2jBuLIDFrUEPBVad3+gZ6+uTsPYpo wo5wZ9M26TkU7EgXc6q71DhPDJBsaJlBtFP+VfCg1pFKwk1+5cAzskemY3R5zQN9Vx 5wwKl8iS42sSUfycNjrY283SB7g8IFuYXe567Urk= 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.20]) by sourceware.org (Postfix) with ESMTPS id 2B0653858D3C; Tue, 10 May 2022 21:51:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2B0653858D3C X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.83.73] ([93.207.83.73]) by web-mail.gmx.net (3c-app-gmx-bap27.server.lan [172.19.172.97]) (via HTTP); Tue, 10 May 2022 23:51:50 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/105230 - [9/10/11/12/13 Regression] ICE in find_array_section, at fortran/expr.cc:1634 Date: Tue, 10 May 2022 23:51:50 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:ZVRE5I7hK8uSDOTMetKbD4hmTlIaw53wPxTFQpfsRqhLOrFWqRgljj8Twdt3WTQxOArSW G0baxLMr+Mtd5x0DNkWiBW9yLU7KxIJgg7RWp01rPFn0Q3z9vKeU0HLph0ccPR8ZNRiRjFB9ssK/ lNc83Dd9y7BylO5haBE+Z7wrKmjC+zGGZByPPDGJgkHFh611taZ4k8kBdmrCNk+yACQddybj2IuE CuKyV6v08xh7xnBGgGtYHP/xXszNt7jBL2fAVWVzaxIQDy/C4xsb+LHoMc+MCm5m1Alt8RsLcK/3 qc= X-UI-Out-Filterresults: notjunk:1;V03:K0:9AwuJtgw6AQ=:O8hcMMyE+9bfEYO2wFXJdZ iwVF1hPgxie7GfdBd+lNtgzLTYTGHXxOR3T8CjecLo7B4sW6cQCCFIklf88y+agWajOW/HLl6 1i0rAlHk5/FXVOnpdstDXJKjcVsKg4G+8EpCmjBvrm3VfXuz9bR1kdEF13p8vGhY0/77q049c 8b6SOgAtKwkMqtcDKcUOAMqga601sE/37DMKzCiP1MOBoEfks/7FOrS3YNrUi7cztrTYvlgRd Z4hsbC2tzVPXJCc3qTeQcCpgCVMX3XBnK+ZmNR2Ik+4V0KZXgzZPmrQGAqaRf47a7an94RY03 JVQSpIVynXHjs5Szja/uvqMo4wrY3dZS5SUpSBeaQs4yDF8EPGdDBp/tuRVPTuwE8T3S43zUn 1bA/xBGRE8K8mI+WMhK+4T7qAHqanEyEbXyRIYcUta9FE8lBnl+++tyS7n0ul8KCoA1Qg2VBv O7Evxpf99ZWonoyHECzYYCdkcCcgbXXayYcPEZzDoLsE+akmMA+J9ZZp4qzNFuzx60EBEzZ0x dA50xz5nfyGv7I55DjsNDu4+fFpkYsOHz8XyTdNtea1r/cIatc/6FCScwFjHbrtcMGQiZmW2q wrGH+1A4tdyysWER+264hjqTrOcksQWSm9seuF14uUxSDl05u1wGxCOmh8+z1ESkmySutXmj1 /kq8xwQmmVMZCMnBe37Nz2ADeMgStniKkTEiDopAlB/y1BeML0x3qTp+zQtjf1h0m+qevZ29m RBklUACxnvTmDQ1SKfRNd6W0iL0F0h8zX8Bj/xj996Wz92RRzQqvq/tNNSw= X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, I intend to commit the attached patch as obvious within the next 24 hours unless there are objections. It fixes the logic which is intended to prevent a NULL pointer dereference on invalid code, which is related to PR104849. (Both PRs by Gerhard). Co-authored by Steve. Regtested on x86_64-pc-linux-gnu. I plan to backport as seems appropriate. Thanks, Harald From eac44ace68dd0476bda93ea49a758904c30e3a33 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 10 May 2022 23:41:57 +0200 Subject: [PATCH] Fortran: fix error recovery on invalid array section gcc/fortran/ChangeLog: PR fortran/105230 * expr.cc (find_array_section): Correct logic to avoid NULL pointer dereference on invalid array section. gcc/testsuite/ChangeLog: PR fortran/105230 * gfortran.dg/pr105230.f90: New test. Co-authored-by: Steven G. Kargl --- gcc/fortran/expr.cc | 4 ++-- gcc/testsuite/gfortran.dg/pr105230.f90 | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr105230.f90 diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index 86d61fed302..be94c18c836 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1595,8 +1595,8 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) if ((begin && begin->expr_type != EXPR_CONSTANT) || (finish && finish->expr_type != EXPR_CONSTANT) || (step && step->expr_type != EXPR_CONSTANT) - || (!begin && !lower) - || (!finish && !upper)) + || !lower + || !upper) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr105230.f90 b/gcc/testsuite/gfortran.dg/pr105230.f90 new file mode 100644 index 00000000000..6c6b42ef9bf --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105230.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/105230 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1, 2] ! { dg-error "deferred shape" } + print *, reshape([3, 4], a(1:2)) +end -- 2.35.3