From patchwork Mon Jan 3 19:45:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 49486 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 D6DBF3858426 for ; Mon, 3 Jan 2022 19:46:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6DBF3858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641239186; bh=zIPgIaJkLXpyIEstm00nYPRZMzrIZeuTIDYS/5sG7aA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QeBMg27ZR8Y/qhTf+zJMRsp+PHFMw7wiAgv0WibZaEatt0DFqEY1F7ST8rFL38gXH WUIQ1B/MiKhpaTYHCgopD66Gq2txrvoQ3UUOKBzPBeOwxaENTo/fnwLKRyhV5dGhQK IrOAwmZlyTO3hGKWewRqYS1wHEcSEPRhfz/wVgJ8= 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 249733858C27; Mon, 3 Jan 2022 19:45:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 249733858C27 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.13.13] ([79.251.13.13]) by web-mail.gmx.net (3c-app-gmx-bs48.server.lan [172.19.170.101]) (via HTTP); Mon, 3 Jan 2022 20:45:38 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/101762 - ICE on non-constant pointer initialization targets Date: Mon, 3 Jan 2022 20:45:38 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:yY0yWCyene9Glsq9Xuoyxo9EaRv1ND7K/6ITkxKXhX/Ziir3AfZCIL2wrlpRK0TRAzOu0 OZRAYxxQKs/oERjx07BB2ItczStkzdDWaZI938IoGZzeY4Nosp1Dt8cUs2jQEVNtuD7rwq++rLve N2AdxTgTrV/HgBQkPkEuOIAAvJEMDvxzC625qwViPSv5NDjot+B8oZbcKt2rUxjr6cJjzC8UEIg9 qrpmp1Q6D7pdQwVyiSl/ejqCnVLLylllpWszsVrySoPUC1qjzP8Jb7XVbeJGpESBmD7QspXiTdKy 0U= X-UI-Out-Filterresults: notjunk:1;V03:K0:9o1l675nwUY=:99c3aBoDXjLErHDvX7/8ed xaBj3z0EzADMGWZ69tRcCYPdQAsrc7jQY8giBFrGC5w+22M4MGQKQNi7a0xw9bj1Awbol+i32 UUfOWoThzbWLmsXsGdEImwt7SR837jb1uzLmvSIKKLCCpimiczOiPS2Adf28L9BxSgnRTQX6I BkZZRlkzf+uqHlsdVytCmjB1ky/9IT6yVQ9fiInXOAw8nLYo/s74t31qD4Qk7VSu2HiURbaV3 B1LcGZ1dY02at+Y8UHgQhuXBHR9221qJAHM6bbcLd6OEAwFDgPlcRdGMfYEHcROCtPt1Rrp05 A6ip28QvN3tUXL6l4mQdcYIr3uzihJ9FHaaJXeDQ9AJBoNcnaMjdgjqidZ2x0WBax3dj2zdqu c3s/QBKgKBRGxjix4HQe1wPz/yaIAfM23i+UIBzGZVEZidXziUZAiADwb5viPqINmte9PC5Nd wZyMl0uZvNw0TUCduIR3GGsgfvmpbPNGSoyoi+PoJzMXjSM7AgN62DbEqMfvu4ijWvVIiCxgx FbQwhhSKtzOYBkVUmhOQVwCQvIc180xLHm5ncbSaq7rA+YoEEUCcNgaBr11KzlUG1qrSA4M58 v+aoj1UQCPO7ohCjd5LnO/xDTsbqPwVfIfgCqWKLdmAB27MlZAHaq7j70UrJbziPnJ3NSk/GY 9wypJwLMQtknEUL+gqOISdS4lOdrHENVBFUQ5zPgk5/Q4n8rhCfgq31dy+8O+39nx2a48ak5P uLuhNecSHvEo+A0I+0u63dfxoxCJkaoa/J58B9AtenbVg9JEu5x2ZVrpQr4= X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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, the initial-data-target for a pointer initialization can be either NULL() or a non-constant target. In the latter case subscripts of the target specification (or substring starting and ending points) must be constant expressions. The patch adds corresponding checks. I have verified that current Intel and Cray compilers generate similar errors for the testcase. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From db7562ef764564560fcc59c192df5c00269382ac Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 3 Jan 2022 20:31:10 +0100 Subject: [PATCH] Fortran: reject invalid non-constant pointer initialization targets gcc/fortran/ChangeLog: PR fortran/101762 * decl.c (match_pointer_init): Check that subscripts and substring indices in specifications of pointer initialization targets are constant expressions. gcc/testsuite/ChangeLog: PR fortran/101762 * gfortran.dg/pr101762.f90: New test. --- gcc/fortran/decl.c | 34 ++++++++++++++++++++++++++ gcc/testsuite/gfortran.dg/pr101762.f90 | 23 +++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr101762.f90 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 4e510cc72ef..4a52a908ac8 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2525,6 +2525,40 @@ match_pointer_init (gfc_expr **init, int procptr) "initialization at %C")) return MATCH_ERROR; + gfc_ref *ref = (*init)->ref; + for (; ref; ref = ref->next) + { + switch (ref->type) + { + case REF_ARRAY: + for (int n = 0; n < ref->u.ar.dimen; n++) + if (!gfc_is_constant_expr (ref->u.ar.start[n]) + || !gfc_is_constant_expr (ref->u.ar.end[n]) + || !gfc_is_constant_expr (ref->u.ar.stride[n])) + { + gfc_error ("Every subscript of target specification " + "at %L must be a constant expression", + &ref->u.ar.where); + return MATCH_ERROR; + } + break; + + case REF_SUBSTRING: + if (!gfc_is_constant_expr (ref->u.ss.start) + || !gfc_is_constant_expr (ref->u.ss.end)) + { + gfc_error ("Substring starting and ending points of target " + "specification at %L must be constant expressions", + &ref->u.ss.start->where); + return MATCH_ERROR; + } + break; + + default: + break; + } + } + return MATCH_YES; } diff --git a/gcc/testsuite/gfortran.dg/pr101762.f90 b/gcc/testsuite/gfortran.dg/pr101762.f90 new file mode 100644 index 00000000000..14bcee9ec00 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr101762.f90 @@ -0,0 +1,23 @@ +! { dg-do compile } +! PR fortran/101762 - ICE on non-constant pointer initialization targets +! Contributed by G.Steinmetz + +program p + integer, target :: a(3) = [7, 8, 9] + integer, pointer :: x => a(3) + integer, pointer :: y => a(n()) ! { dg-error "constant expression" } + integer, pointer :: z => a(:n()) ! { dg-error "constant expression" } + character(7), target :: c = "abcdefg" + character(3), pointer :: c0 => c(2:4) + character(3), pointer :: c1 => c(m():) ! { dg-error "constant expression" } + character(3), pointer :: c2 => c(:m()) ! { dg-error "constant expression" } + print *, x +contains + pure integer function k () + k = 2 + end function k + subroutine s () + integer, pointer :: yy => a(k()) ! { dg-error "constant expression" } + print *, yy + end subroutine s +end -- 2.31.1