From patchwork Thu Jan 20 21:48:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 50289 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 47EFA385840D for ; Thu, 20 Jan 2022 21:49:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47EFA385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1642715363; bh=I/04+oNmx6/YlQUCFLzcuquIc0Tdf1YAvY2gzLkb5VA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nKbpBLaZWZZKjFvaEdqcdwo1uPlLr0fsk70o5EPns4jxwuWkLvFDF4HvEgFIQet2+ OqzPHL16CpTp/hSs2MiomoEGW+I7e7K9V8QNLelfq7XnmHR3/E1GeLm0rm7THcOa/J v0+5vxD/89/hGAMKdTfxURUafCCDqSNX05amWV7U= 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.21]) by sourceware.org (Postfix) with ESMTPS id CC51E3858407; Thu, 20 Jan 2022 21:48:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CC51E3858407 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.15.56] ([79.251.15.56]) by web-mail.gmx.net (3c-app-gmx-bap08.server.lan [172.19.172.78]) (via HTTP); Thu, 20 Jan 2022 22:48:34 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/104127 - [9/10/11/12 Regression] ICE in get_array_charlen, at fortran/trans-array.c:7244 Date: Thu, 20 Jan 2022 22:48:34 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:J5CKEInySR4VdfJG4a0IKDOSklrtGE6o2HkjhJGzkn7YBbvabsoyhcYpJFKce6v32x9le Aj47pFLWr0ikPjpsnx5Mxop+sMt2Y/IBBOl++5TSEnmmB2XuBkyTggV2BqmAAXhczJ4pF841eys5 pld6IxiiEsyYdG1o4kQR4+j396APaxFV2WvtJ+V12KT3IS7d1THgcXRPsQrJK8GYdfgJRqOlxxax DmP1u/K7jm+DULix4AtlJjod5YooRVCrZxW5RXU3Me8C1ztjxRT6zjB7HgEYAjedQmAIb34TBGai wQ= X-UI-Out-Filterresults: notjunk:1;V03:K0:tEahYZhW3UQ=:n5jm+8ZKAmNsZdptks036c BAs+B5IASKVoWrDWp8mMoB57QkgjnPK2iPkr473rVS5c0/GndLqnfnFG60T0S78QsS7yTQTGD VFMexcqDi4TINH51cljB511fM1mg3fSUUeLUyF2EmVFWLnA7q4Q5RpS40lcWbImBHm++qt9C1 DGv7P0hxxZfsCvCThjk2fBTQuEQ46hQHNXSwkkNS15392QB4dPhbdh/uEoCnxTAOJdTZhTZjb Buo0J7cJwMOP5jGttVN/KQptEKIgwkREp9kIqZ9NKB2Sp53/16Xz1J9OHNsRmMtj4XQSHbuf0 sMsf5OXm7snJMYV2JATyiU5oqdpep8QW39SN2oIMuH8ZqPXQOkbD7fAeB6YElzBjputsUUqdf eCkUMu1fCcfmYBz2SmUVnlVI9AMC+1dn5VDhSLrzUFk7YvnSK4PMZeD/b2VZA95cfjPTBra/z tWpBgPeE7s13We2f/FXn4VA54fHQ6YSbJzobkTAMHT1obrWSJMHBRbF1nF120rMfPsqxmw1ab un24qFzkaawPP0PC1oLWmaZlCPb4YUR8+Pqw4V/2vyS2wLxQ72262ncGS2jaE0SAc1I4fzLNH Muwo6FkJSf5eocx54bhxOrfxtVLi2NDTNGfn/urw1n3TnLfR3DN4ceOw/i6MzVl8DngXLGo7r k7gxtjndyHPgUHS4hmiD27HtjKOCTZQJlLbo92ykMYa+jkvbh2uzQTF6IcdQ4DEejpnfJ2lpd grcQrsXrxF+VhQZ82JeRbiR3fnOYxt67HltOIs7vfEwPtXsabbALGyXppWJ4G5IgKEPkoOB8X CpP4bGH 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_H3, RCVD_IN_MSPIKE_WL, 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 Fortranners, when simplifying TRANSFER with a MOLD argument of type character and with SIZE=0 we lose the character length. This happens in all gfortran versions and results in wrong code. The purported regression is that at some point in the 9-development this lead to a (previously possibly latent) ICE. The attached patch sets up the character length in the typespec and fixes the ICE. There is another generic hidden/latent problem with array constructors of size 0 passed to procedures (see e.g. pr86277) which will remain and is beyond the scope of this fix. Regtested on x86_64-pc-linux-gnu. I also fixed a minor logic bug in testcase transfer_simplify_11.f90. OK for mainline? Backports to branches? Thanks, Harald From c9882ace6199e2a327b69449f825e0366b442cba Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 20 Jan 2022 22:36:50 +0100 Subject: [PATCH] Fortran: fix simplification of TRANSFER for zero-sized character array result gcc/fortran/ChangeLog: PR fortran/104127 * simplify.cc (gfc_simplify_transfer): Ensure that the result typespec is set up for TRANSFER with MOLD of type CHARACTER including character length even if the result is a zero-sized array. gcc/testsuite/ChangeLog: PR fortran/104127 * gfortran.dg/transfer_simplify_11.f90: Fix logic. * gfortran.dg/transfer_simplify_13.f90: New test. --- gcc/fortran/simplify.cc | 13 ++++++- .../gfortran.dg/transfer_simplify_11.f90 | 2 +- .../gfortran.dg/transfer_simplify_13.f90 | 34 +++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/transfer_simplify_13.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index 3881370d947..8604162cfd5 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -8162,7 +8162,18 @@ gfc_simplify_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size) set even for array expressions, in order to pass this information into gfc_target_interpret_expr. */ if (result->ts.type == BT_CHARACTER && gfc_is_constant_expr (mold_element)) - result->value.character.length = mold_element->value.character.length; + { + result->value.character.length = mold_element->value.character.length; + + /* Let the typespec of the result inherit the string length. + This is crucial if a resulting array has size zero. */ + if (mold_element->ts.u.cl->length) + result->ts.u.cl->length = gfc_copy_expr (mold_element->ts.u.cl->length); + else + result->ts.u.cl->length = + gfc_get_int_expr (gfc_charlen_int_kind, NULL, + mold_element->value.character.length); + } /* Set the number of elements in the result, and determine its size. */ diff --git a/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90 b/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90 index 0911f9dba3a..409e4768a10 100644 --- a/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90 +++ b/gcc/testsuite/gfortran.dg/transfer_simplify_11.f90 @@ -4,5 +4,5 @@ integer, parameter :: N = 2 character(len=1) :: chr(N) chr = transfer(repeat("x",ncopies=N),[character(len=1) ::], N) - if (chr(1) /= 'x' .and. chr(2) /= 'x') STOP 1 + if (chr(1) /= 'x' .or. chr(2) /= 'x') STOP 1 end diff --git a/gcc/testsuite/gfortran.dg/transfer_simplify_13.f90 b/gcc/testsuite/gfortran.dg/transfer_simplify_13.f90 new file mode 100644 index 00000000000..59109c6029d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/transfer_simplify_13.f90 @@ -0,0 +1,34 @@ +! { dg-do compile } +! { dg-options "-fdump-tree-original" } +! PR fortran/104127 - ICE in get_array_charlen +! Contributed by G.Steinmetz + +program p + character(4) :: mold = "XYZ" + integer :: i = 0 + integer, parameter :: l1 = len (transfer('ab', 'xyz', size=0)) + integer, parameter :: s1 = size (transfer('ab', 'xyz', size=0)) + integer, parameter :: l4 = len (transfer(4_'abcd', 4_'xy', size=0)) + integer, parameter :: s4 = size (transfer(4_'abcd', 4_'xy', size=0)) + integer, parameter :: l2 = len (transfer('ab', mold, size=0)) + integer, parameter :: l3 = len (transfer('ab', mold, size=1)) + integer, parameter :: l5 = len (transfer('ab',['xyz'], size=0)) + integer, parameter :: s5 = size (transfer('ab',['xyz'], size=0)) + call sub0 ( transfer('a', 'y', size=0) ) + call sub1 ([transfer('a', 'y', size=0)]) + call sub2 ([transfer('a',['y'],size=0)]) + call sub3 ( transfer('a', 'y', size=1) ) + call sub4 ([transfer('a', 'y', size=1)]) + call sub5 ( transfer('a', 'y', size=i) ) + call sub6 ( transfer(1_'abcd', 1_'xy' , size=0)) + call sub7 ( transfer(1_'abcd',[1_'xy'], size=0)) + call sub8 ( transfer(4_'abcd', 4_'xy' , size=0)) + call sub9 ( transfer(4_'abcd',[4_'xy'], size=0)) + print *, transfer('abcd', 'xy', size=0) + if (l1 /= 3 .or. s1 /= 0) stop 1 + if (l4 /= 2 .or. s4 /= 0) stop 2 + if (l2 /= 4 .or. l3 /= 4) stop 3 + if (l5 /= 3 .or. s5 /= 0) stop 1 +end + +! { dg-final { scan-tree-dump-not "_gfortran_stop_numeric" "original" } } -- 2.31.1