From patchwork Tue Mar 14 19:38:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 66387 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 D53EB3857C5A for ; Tue, 14 Mar 2023 19:39:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D53EB3857C5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678822765; bh=wwv1myNY5H5mksx42Y5tcs93zQOAqssKy/W8IBYGplA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=EkqMP1EkN4LSPS+M87LGtDNBBC54w6WFOyilJmd31QpaaIcmyMWybc8dQx6QpKhrI vwwB60N7yKt+4+brnzhep3c+IgXmkrGN4faIfn78NRm++ht8Io8EljSzn8PkF+5W/g I5/p876WadssXERDRww1Np7Kwj9EUCALL8JLZC7E= 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 4255F385841A; Tue, 14 Mar 2023 19:38:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4255F385841A X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.80.102] ([93.207.80.102]) by web-mail.gmx.net (3c-app-gmx-bap12.server.lan [172.19.172.82]) (via HTTP); Tue, 14 Mar 2023 20:38:47 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Cc: tobias@codesourcery.com Subject: [PATCH] Fortran: rank checking with explicit-/assumed-size arrays and CLASS [PR58331] Date: Tue, 14 Mar 2023 20:38:47 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:t7gqnGbRUKvoKm98e+r7Rclo8y+f7oVN7VcNr41vmb6Ao986cZJPDp0+QD1sNO2FejrMe zZyQm1Y518XgSTdnG+AW8jo9W61QyvHhf9GbsrrPYE9WXZjTpjxGAaXtX9u0xB8utEVhs3dDaoys l3vosc5ydoJC/RYOQxqTgg3wJUuaNwnBYxOYdCYYCkWJU/yoGBI/1NHjojFCP9SNt/+fUnSKtmSp 0JN2ncmQuO0dGJomdZW5pnNk4JJI2jE+n6BGonhIy9/R4d6IIVVIslZ0F5oPNHMmJCMfdlARF9Qd SE= UI-OutboundReport: notjunk:1;M01:P0:bzV5PGP/g/0=;PC58kVmCdjRfSVqP859PPWTOsxs 7osTR3PZeXrM061/4VF2RUn2lyn8v8/B3eXoTxo8DSBVKGXnxNTTH9zcPHf9Jm64Fe2XW530v p+67DwTU0mC9my1aDDrpdppwGjb+j3eSaouFVJx488u4zB9DNUXBEAdgs/GlFwDLWBwo4/T6u 0x3y6ddskfmkT5ftyHyKf9spDYhWOwFxpASbLTnODmZ0uT9YenPri0SAAXkJW4kvZ2LFmABBB wQ+ktC26OqRGVQX2vqNUCV66V2yfZxzEbfDl9TNqRqtFO01sN0mKIWfhlVwFU0E1MTzxY8JNR 1YkuDlDsIZ7ZjnpZywcx1F0rqeA12MDLippF/657AxE5KWmyuYZxdha27g8ma9PG3nevW5dGa rZzRUoLeEiRx+kfkVMivrjDLs9jLayLuFvRSPaHLAzOHVSFXEgyIaUgiBO3xV7Vrvt8k8CHAD IZtRdgZMyPHVKTvCZr7lbATV20hcsrC865fh38F5379yyFpzR2HO4koq9agCii07MOq1oIP1X p9mPrb9Us6a4Ry6q2Fjz0Lco9jp+bZoqgyGFZorEWv5vYzn6Du1fPYj7dXYkr80nZUmA8Li5F CCQnh3twX2bbhFGJ7xYEODewB83qNN5qFc0XrRAFynxydPqBTmhnwxZ++I+nAwLh6xfNMiEI0 gSV0XeVXH9fMd0QTtjr893rCHj9RpXmuJkLa/KmmdxYtuoSOIWpPYKJBV2CkZuxQd4j4VNarn GQU0l7c1MwKEpQk4oKLvvhP8PNRO6a4bjVGVKj+87KDyH/XEuQJutzDZESPAGjkYJKl6mo/Iz QjEj4N+xKFDJXGbUK2Lz3Zfw== X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 attached patch, which is based on a draft by Tobias, fixes an old rejects-valid issue with rank checking for CLASS arrays by using the proper array spec of CLASS variables. The testcase covers only non-coarray cases, as playing with coarray variants hit pre-exisiting issues in gfortran that are very likely unrelated to the interface checks. I consider this rather as post 13-release stuff. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From 4453686ae4e70c14a0898c6687db912fa84ece9f Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 14 Mar 2023 20:23:06 +0100 Subject: [PATCH] Fortran: rank checking with explicit-/assumed-size arrays and CLASS [PR58331] gcc/fortran/ChangeLog: PR fortran/58331 * interface.cc (compare_parameter): Adjust check of array dummy arguments to handle the case of CLASS variables. gcc/testsuite/ChangeLog: PR fortran/58331 * gfortran.dg/class_dummy_10.f90: New test. Co-authored-by: Tobias Burnus --- gcc/fortran/interface.cc | 27 +++++++--- gcc/testsuite/gfortran.dg/class_dummy_10.f90 | 56 ++++++++++++++++++++ 2 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/class_dummy_10.f90 diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index dafe41753b7..1d0f8bb5915 100644 --- a/gcc/fortran/interface.cc +++ b/gcc/fortran/interface.cc @@ -2349,6 +2349,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, char err[200]; gfc_component *ppc; bool codimension = false; + gfc_array_spec *formal_as; /* If the formal arg has type BT_VOID, it's to one of the iso_c_binding procs c_f_pointer or c_f_procpointer, and we need to accept most @@ -2540,6 +2541,9 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, return false; } + formal_as = formal->ts.type == BT_CLASS ? CLASS_DATA (formal)->as + : formal->as; + if (codimension && formal->attr.allocatable) { gfc_ref *last = NULL; @@ -2650,10 +2654,10 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, if (symbol_rank (formal) == actual->rank || symbol_rank (formal) == -1) return true; - rank_check = where != NULL && !is_elemental && formal->as - && (formal->as->type == AS_ASSUMED_SHAPE - || formal->as->type == AS_DEFERRED) - && actual->expr_type != EXPR_NULL; + rank_check = where != NULL && !is_elemental && formal_as + && (formal_as->type == AS_ASSUMED_SHAPE + || formal_as->type == AS_DEFERRED) + && actual->expr_type != EXPR_NULL; /* Skip rank checks for NO_ARG_CHECK. */ if (formal->attr.ext_attr & (1 << EXT_ATTR_NO_ARG_CHECK)) @@ -2662,14 +2666,20 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, /* Scalar & coindexed, see: F2008, Section 12.5.2.4. */ if (rank_check || ranks_must_agree || (formal->attr.pointer && actual->expr_type != EXPR_NULL) - || (actual->rank != 0 && !(is_elemental || formal->attr.dimension)) + || (actual->rank != 0 + && !(is_elemental || formal->attr.dimension + || (formal->ts.type == BT_CLASS + && CLASS_DATA (formal)->attr.dimension))) || (actual->rank == 0 && ((formal->ts.type == BT_CLASS && CLASS_DATA (formal)->as->type == AS_ASSUMED_SHAPE) || (formal->ts.type != BT_CLASS && formal->as->type == AS_ASSUMED_SHAPE)) && actual->expr_type != EXPR_NULL) - || (actual->rank == 0 && formal->attr.dimension + || (actual->rank == 0 + && (formal->attr.dimension + || (formal->ts.type == BT_CLASS + && CLASS_DATA (formal)->attr.dimension)) && gfc_is_coindexed (actual)) /* Assumed-rank actual argument; F2018 C838. */ || actual->rank == -1) @@ -2690,7 +2700,10 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, } return false; } - else if (actual->rank != 0 && (is_elemental || formal->attr.dimension)) + else if (actual->rank != 0 + && (is_elemental || formal->attr.dimension + || (formal->ts.type == BT_CLASS + && CLASS_DATA (formal)->attr.dimension))) return true; /* At this point, we are considering a scalar passed to an array. This diff --git a/gcc/testsuite/gfortran.dg/class_dummy_10.f90 b/gcc/testsuite/gfortran.dg/class_dummy_10.f90 new file mode 100644 index 00000000000..cee5d4d82b2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_dummy_10.f90 @@ -0,0 +1,56 @@ +! { dg-do compile } +! PR fortran/58331 - rank checking for CLASS dummy arguments + +module mymod + implicit none +contains + subroutine mysub(a, n) + integer, intent(in) :: n + class(*), intent(in) :: a(n) + + select type(a) + type is(integer) + print *,'a is integer' + print *, "n=", n, ' a=', a + class default + print *,'a is unsupported type' + stop 1 + end select + end + + ! Assumed rank + subroutine sub_ar (a) + class(*), intent(in) :: a(..) + print *, rank (a), size (a), ":", shape (a) + end + + ! Assumed shape + subroutine sub_as1 (a) + class(*), intent(in) :: a(:) + print *, rank (a), size (a), ":", shape (a) + end + subroutine sub_as2 (b) + class(*), intent(in) :: b(:,:) + print *, rank (b), size (b), ":", shape (b) + end +end + +program p + use mymod + implicit none + integer :: a(3) = [11, 12, 13] + integer :: b(2,2) = reshape([21, 22, 23, 24], [2,2]) + integer :: c = 1 + + call mysub(a,3) + call mysub(b,4) + call sub_ar(a) + call sub_ar(b) + call sub_ar(c) + call sub_as1(a) + call sub_as2(b) + ! + call mysub(c,1) ! { dg-error "rank-1 and scalar" } + call sub_as1(b) ! { dg-error "rank-1 and rank-2" } + call sub_as2(a) ! { dg-error "rank-2 and rank-1" } +end -- 2.35.3