From patchwork Mon Aug 30 20:48:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1522333 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=DUVK6VoQ; dkim-atps=neutral Received: from sourceware.org (server2.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 4Gz2Xc6f9Wz9sR4 for ; Tue, 31 Aug 2021 06:50:56 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A7C743858437 for ; Mon, 30 Aug 2021 20:50:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7C743858437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1630356654; bh=R8wD5dj27UUgkUdsRjq1TO3AEr8kn+lLbKSvJY2MSE0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=DUVK6VoQsMbNWkNUDpMDGCg2bIGrgXILQotunhqfv2P/iSCNviLkclqyMIDzA0Vds yhOenWhUhgBjHb1o2xc1o3lUBbvU3B9hYjWxqjkqw37d7dFVyKRqZg95sUqTKP6h2i ABLFIPl9rn4QEzvOzU0+OWZGtzM9ilw72tzMnsWo= 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 AFE263858012; Mon, 30 Aug 2021 20:48:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFE263858012 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.86.115] ([93.207.86.115]) by web-mail.gmx.net (3c-app-gmx-bap43.server.lan [172.19.172.113]) (via HTTP); Mon, 30 Aug 2021 22:48:47 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] PR fortran/101349 - ICE in gfc_get_descriptor_field, at fortran/trans-array.c:140 Date: Mon, 30 Aug 2021 22:48:47 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:tG0gVR9P7Ft1GvZm+ltRWNj2MU84AS4HfHyM0keOI5VEXOWEjyniTGt3/Ey/3A8axuu3g BzqtMITe374rl+ZyZVa21eMEf9NVnZwbuOFaSHPxLE7aRdgbDQUunjuoZDM9hm8AzO9d18U7WVpo csKx2H3XGNpSP1g5Jf2Kns/UnQwq7DeX4Wcm+jQGkVkhylwSP5bNdBbYPSrWc3XrNXSA97pX9VIw 0y6WHaP99x/bxXUI1wIyVRSJ1ebWkby71PvrOAyj9TNvQYla9B3o+OxomLePgEFfwnk/3cK4HmUy Uc= X-UI-Out-Filterresults: notjunk:1;V03:K0:wgeOJSizfdo=:JyEndIbguka9EJRCbpca8/ /oe26L32cEiwDXcTCrEciaYBG/acQaDaR+qKANtMQYkQ45QmJfUYFrmpuw9k5A/F2XnVk0NlV erUlu9VND8sa2yaHiR25txIEcSgROMwQfnGeQzG7mtPmOud+gGSmo7ad9xfmJsOVYZTVFgQDI hJgk7rtCOpi/+z2iBut+7Td5JEGlvgwXuwaXYjKStOY66FtStAkD5CHOI3WCpP/WWUyRcfX55 bCFWWxBXc+0RkPGyC0zkZL16AfbglGN/JBKm71bVgnKyBvSAMg/qnYVj9yY/wuTSk8QFnWE6/ Ar33fZy7fhRQKwHxKsNxbBsGTAXwwcCz6/PCkAt1dfrmL2MnKypVcWIB4oQ2VET474rm7JjfZ mgBMf23JbjcFez0hFRYHKsaTpdIRirBLM9ygwi/qvTSTEtkI78FqB+bIq6HnmoVmqbtaO0rrj XGQm3ysM91d8OFbCfX+LdLI1fYvMCWgSaMDF3hkGJhVi7w78crF3V3tzvLDwIPiZD26SoDUgt z28lsaiBCh3KBLa35BU2y9gWfhezZxe9O8AMAg6W0VSH2El4rtO+b7sThyT5tUQQxpdSDkp1M LTYMNuAmGxwIP1yzRraAOsEQ+NwLTzdw85Z9RkaxxEOTkHdtRvjsNu/Oo5vy5ARqJ/hGNsSUI fW6kIOaiW0xAT95QNX5dLfhZpo80OEwX0hQPxUjZsK9mfEoJ8p5QMmUq4FS2s8A5IrrYgiMLU TIetzxSeEZFd3ndlomr3xgAMTPSIqjJ8dNbJKJPizmCHY6uywGDJBI9rXw+W+pKAIisGpvo0V Pc+9mAsnJO4t1W51D9gQsk5JEwyQw== X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_MSPIKE_H2, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The check of arguments to ALLOCATE did not properly implement F2008:C628 / F2018:C932, as it excluded unlimited polymophics, in contrast to the standard text. Fix this. Committed Steve's patch as obvious after regtesting on x86_64-pc-linux-gnu. Thanks, Harald Fortran - correct check for constraint F2008:C628 / F2018:C932 gcc/fortran/ChangeLog: PR fortran/101349 * resolve.c (resolve_allocate_expr): An unlimited polymorphic argument to ALLOCATE must be ALLOCATABLE or a POINTER. Fix the corresponding check. gcc/testsuite/ChangeLog: PR fortran/101349 * gfortran.dg/unlimited_polymorphic_33.f90: New test. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index f641d0d4dae..d7aa2868cef 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7829,8 +7829,9 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code, bool *array_alloc_wo_spec) } } - /* Check for F08:C628. */ - if (allocatable == 0 && pointer == 0 && !unlimited) + /* Check for F08:C628 (F2018:C932). Each allocate-object shall be a data + pointer or an allocatable variable. */ + if (allocatable == 0 && pointer == 0) { gfc_error ("Allocate-object at %L must be ALLOCATABLE or a POINTER", &e->where); diff --git a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_33.f90 b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_33.f90 new file mode 100644 index 00000000000..8bb8864cb26 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_33.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +! PR fortran/101349 - ICE in gfc_get_descriptor_field +! Check constraint F2008:C628 / F2018:C932 + +subroutine s(x) + class(*) :: x(:) + allocate (x, source=['abc']) ! { dg-error "must be ALLOCATABLE or a POINTER" } +end + +subroutine t(x) + class(*), allocatable :: x(:) + allocate (x, source=['abc']) +end + +subroutine u(x) + class(*), pointer :: x(:) + allocate (x, source=['abc']) +end