From patchwork Sat Nov 28 22:16:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1407697 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=j9naT3Yo; 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 4Ck5Sk0L6Vz9sT6 for ; Sun, 29 Nov 2020 09:16:51 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 98473387087C; Sat, 28 Nov 2020 22:16:46 +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.15.18]) by sourceware.org (Postfix) with ESMTPS id D498C386F83E; Sat, 28 Nov 2020 22:16:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D498C386F83E 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=1606601800; bh=sUrEtvdYeHUPDVhgDPj1TJds9VAGpeS6101kfndtJUM=; h=X-UI-Sender-Class:From:To:Subject:Date; b=j9naT3YoeR9mnym6AqTPoOURae22hkEWwJ2X0IqE4cGJE5IKCYSaMwcPpsVdXQQJb +pRfXpbHwojTzkjO6av35yTw4WNgrnz22E52StAfOBaIMkzHtfnuXulg0Vcw0xJDYr GHc0sk2fDg9iC+20oaULoiatohW8+uHl8eh1cWWw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.232.145.254] ([79.232.145.254]) by web-mail.gmx.net (3c-app-gmx-bs11.server.lan [172.19.170.62]) (via HTTP); Sat, 28 Nov 2020 23:16:40 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] PR fortran/98017 - [8/9/10/11 Regression] Suspected regression using PACK Date: Sat, 28 Nov 2020 23:16:40 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:xcfTJ62muvdHuoAzkD/i5FJRPBvWRbEYHrvBNFbBQTqMYgMQdGX2pbNvkAzOxbXckvvQy dKkC+mRNykeSFJuMZMaqAO3opdniYLHkpCY9HZqAXYEQ5RTv9FsgrqfXfw6p6QxTIP5RVYyT2l36 iYTU3JBEyQhwmqDCnblhmInauRFcjBCS6mDrfRkL/oy5g+KcXpYKFtqGjq6i7UJLFvRmHR5PLhdn Mn6euqRO9t+wtFdbjLOVjKz4pfK8WFD8j+tIcN5U2hqgInXUwUHRAe9QkuTw+MVRvXxDhKrR9HQZ wI= X-UI-Out-Filterresults: notjunk:1;V03:K0:ZgtCeS04hr8=:WNay+nubYrKHssqCaDKzjR dU/R4V7w0/03HJ9MpLXk78fkXj3NMyTH7S5ZmTw9GLmxKlTRzp5imsrpoBCfrrdINoO+RquGS lQV18M5VtOL31Rs53e6iU2hn4GDlyKw+FZNKrOegOZza2mSeVtvQTiTy20X3bBPNGPWvI1DL/ 5nomiXcN+OamVirdHzZmNb6Gf4Zc08mWr3pZIzKea47zlv+SPwfR9ctooSx2PsXkAIWxPDalW 5+eFTWSy4kB8pBqR3wd+jKN+YVDpcXH0ieiKe3SImcYdF+p1LGcxxc/sk6Su9QIwlfVoa2u4l A6GHwGMYLIwSHn7e5c14IFuBA5LV+8zRbeK2LyeKTRFhCU7qUarXKF0yA7Eh4KRHO0y9mWr+4 z71/5CxNu7EUiRwJK6UxwWLbiX2YFSU3BtJRsUuMganq4h3tMB1LF36Ym6trLYfZVDJJ+naoM KJ7UNnCDIvsJsDGAqXvMowAnaI9zlYqrRvJGTHtZFr+9pHipMaLEay1LxuyRSc5F1QshNWQbD wJiEzn54R7VyFXSSA5L8/aWwp8SpQzbwdD1J8CNRFFPIusxUcew3bbHimSdF9bgFgvZV/wR0H 7fzRZr+3Te/3I= X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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" When substituting an array-valued character parameter variable, the call to gfc_copy_expr returns character length 1. Fix up the resulting length. I could not figure out whether this is a bug or a feature of gfc_copy_expr. But the fix to simplify_parameter_variable would not do any harm in any case. Regtested on x86_64-pc-linux-gnu. OK for mainline, and since this is a bad code regression, backports down to 8-branch? Thanks, Harald PR fortran/98017 - Suspected regression using PACK When substituting a parameter variable of type character, the character length was reset to 1. Fix this by copying the length. gcc/fortran/ChangeLog: * expr.c (simplify_parameter_variable): Fix up character length after copying an array-valued expression. gcc/testsuite/ChangeLog: * gfortran.dg/pr98017.f90: New test. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 32d905ad179..8f1a3a34053 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2096,6 +2096,10 @@ simplify_parameter_variable (gfc_expr *p, int type) return false; e->rank = p->rank; + + /* Fix up character length since gfc_copy_expr may not preserve it. */ + if (e->ts.type == BT_CHARACTER && p->ts.u.cl) + e->ts.u.cl = gfc_new_charlen (gfc_current_ns, p->ts.u.cl); } if (e->ts.type == BT_CHARACTER && e->ts.u.cl == NULL) diff --git a/gcc/testsuite/gfortran.dg/pr98017.f90 b/gcc/testsuite/gfortran.dg/pr98017.f90 new file mode 100644 index 00000000000..24d7adadb40 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr98017.f90 @@ -0,0 +1,9 @@ +! { dg-do run } +! PR98017 - [8/9/10/11 Regression] Suspected regression using PACK + +program p + implicit none + character(*), parameter :: s(1) = ['abc()'] + if (len (pack (s, s(:)(:1) =='a')) /= len (s)) stop 1 + if (any (pack (s, s(:)(:1) =='a') /= s)) stop 2 +end