From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 9A119385801D; Thu, 11 Feb 2021 18:02:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9A119385801D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Tobias_Burnus@mentor.com IronPort-SDR: +ed2gLe2G6BrY/gYs9t996LjnPkd6NoELP6qY40nKSHFLd3MY5ScDB/jlbpnj2S33d3q5h8Bzj SnH8Sj0yDQg5meLoPIWKvg+iTCxR2/yKWFPodVA1fpVkdCOwQOKzCcykNWK2gqwky4Q28saYPE i5Ogni9qRTH7Fvo+GUXA7LaPUHNkNnQnxyivL2hTMRCXh7oMdvqHXW/afjGxhrOVDBe67K5xAB 7tlkJAlrmqYh4F0SPr0EXjyNVqdVvB6bHjGdDpGZd++iyIlw60nhl7mAlwdEPMJ2aRudZonJZ2 i94= X-IronPort-AV: E=Sophos;i="5.81,171,1610438400"; d="diff'?scan'208";a="58018996" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 11 Feb 2021 10:02:29 -0800 IronPort-SDR: CFV8NBn5e8KXvSmwdBd0zKxiJAhih6yiJA+a/phve7OzZPAaxFmty8HO2XB3zDBIjcpYK+t8Y/ At/Q41iZewC0SJWBzAeiGsgO0Iqpx0yWYp7F4vMov/OiNbAJ3gQUcHEvFhoeswhDr8983Zhw3G U4lR50j++zgT04IPLJhNaOG8F58EVUswRO6EElbIa3M2+fTBX9jb72P3vpP0ovW50ADBdY6365 wH4FwxQUvAPthUyXiWPSDSJTBweNM4v5jI3/ODs1il7Rhz501M0h1BAb5draO2fqwP6YpWL95m 8Z4= To: gcc-patches , fortran From: Tobias Burnus Subject: [Patch] Fortran: Fix rank of assumed-rank array [PR99043] Message-ID: <4f5fc485-3cc9-122e-be36-eadf576675db@codesourcery.com> Date: Thu, 11 Feb 2021 19:02:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7F42C64F81308CBE0C51C351" Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, 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: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 18:02:33 -0000 --------------7F42C64F81308CBE0C51C351 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: quoted-printable In the Fortran standard, I think it is best explained in the description of the RANK intrinsic: "Example. If X is an assumed-rank dummy argument and its associated effective argument is an array of rank, RANK(X) has the value 3." That's already well tested in assumed_rank_16.f90; however, as the PR shows, this should not be reset to "-1" when passing it further on as actual argument to another assumed-rank dummy argument. OK for mainline? Reported against GCC 10, not a regression but simple wrong-code fix; does it make sense to apply there was well? Tobias ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 M=C3=BCnchen R= egistergericht M=C3=BCnchen HRB 106955, Gesch=C3=A4ftsf=C3=BChrer: Thomas H= eurung, Frank Th=C3=BCrauf --------------7F42C64F81308CBE0C51C351 Content-Type: text/x-patch; charset="UTF-8"; name="assumed-rank-fix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="assumed-rank-fix.diff" Fortran: Fix rank of assumed-rank array [PR99043] gcc/fortran/ChangeLog: PR fortran/99043 * trans-expr.c (gfc_conv_procedure_call): Don't reset rank of assumed-rank array. gcc/testsuite/ChangeLog: PR fortran/99043 * gfortran.dg/assumed_rank_20.f90: New test. gcc/fortran/trans-expr.c | 5 ++-- gcc/testsuite/gfortran.dg/assumed_rank_20.f90 | 36 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index b0c8d577ca5..103cb31c664 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6403,9 +6403,10 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, /* Unallocated allocatable arrays and unassociated pointer arrays need their dtype setting if they are argument associated with - assumed rank dummies. */ + assumed rank dummies, unless already assumed rank. */ if (!sym->attr.is_bind_c && e && fsym && fsym->as - && fsym->as->type == AS_ASSUMED_RANK) + && fsym->as->type == AS_ASSUMED_RANK + && e->rank != -1) { if (gfc_expr_attr (e).pointer || gfc_expr_attr (e).allocatable) diff --git a/gcc/testsuite/gfortran.dg/assumed_rank_20.f90 b/gcc/testsuite/gfortran.dg/assumed_rank_20.f90 new file mode 100644 index 00000000000..10ad1fc8e89 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_rank_20.f90 @@ -0,0 +1,36 @@ +! { dg-do run } +! +! PR fortran/99043 +! +module assumed_rank_module + implicit none + private + + public :: rank_of_pointer_level1 +contains + subroutine rank_of_pointer_level1(ap,aa) + real, dimension(..), intent(in), pointer :: ap + real, dimension(..), intent(in), allocatable :: aa + if (rank(ap) /= 3) stop 1 + if (rank(aa) /= 3) stop 2 + call rank_of_pointer_level2(ap, aa) + end subroutine rank_of_pointer_level1 + + subroutine rank_of_pointer_level2(ap,aa) + real, dimension(..), intent(in), pointer :: ap + real, dimension(..), intent(in), allocatable :: aa + + if (rank(ap) /= 3) stop 3 + if (rank(aa) /= 3) stop 4 + end subroutine rank_of_pointer_level2 +end module assumed_rank_module + +program assumed_rank + use :: assumed_rank_module, only : rank_of_pointer_level1 + implicit none + real, dimension(:,:,:), pointer :: ap + real, dimension(:,:,:), allocatable :: aa + + ap => null() + call rank_of_pointer_level1(ap, aa) +end program assumed_rank --------------7F42C64F81308CBE0C51C351--