From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id E70123854166; Mon, 10 Apr 2023 20:49:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E70123854166 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1681159786; i=anlauf@gmx.de; bh=TPw9Ww/QMhZdCU8HuwUsykorYJh7lI3IQTX1/3fe7wo=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Qk2m33xj1mtE6GWaQTruMPdVDy25Lg05ncKGOwJO578jtpV8tAzr02rl8FmScfqru MNc72ttG+g1vVy8MhXWl9NUutfT490xZPvPvVolpfC7wjFZpuGf1NHN5PDJbjXmHN0 7V7+yZvQ19aPN9xAzG5pRtyJYTQtDDzKyBB1vixcHilRleriPU+xfiMdWpvlZsxJHN CbWPDOHttnPKRqx3ULBvgpYoAQcQZP1XVb860g6LiX7Y5DTGgCyurW9DitauABP8Fg mNisXWamdRpRCuVmEzLv8YsPUD3l9CsYiG3fZxqd/KtQH8jUjgRdHHqrs6OjbLaKqY C68e0IKreRhQA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.15.178] ([79.251.15.178]) by web-mail.gmx.net (3c-app-gmx-bs33.server.lan [172.19.170.85]) (via HTTP); Mon, 10 Apr 2023 22:49:46 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: resolve correct generic with TYPE(C_PTR) arguments [PR61615] Content-Type: multipart/mixed; boundary=kenitram-190faebd-7fe7-4588-9d6e-89da3930e425 Date: Mon, 10 Apr 2023 22:49:46 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:Cn7WTfZuyrLWNiMAYbuYHi/9sDGaEr6otfxOWFXvQgpYCDdOv6plMn80poMKyM79fjNIG Ew9WGXn9io1EKITOEDieqV04UoQQQzFK7IuBIa74aW8wW2UBq+piV75aEv4SW5f8j+kkfEh3IwhY uJqLeBdo/Wrlu1btdZuOT4W/N1NiHQawuXlnun3KUVkuxMYbUs8f6HFsgYNtb8IYSoXGcfDsME5g F17KJSYIMyD+VCHeSWOH6OO+tnV5yHIirnRPNZycqcsjWubfpVYnupyFkGzZvupSGnJUIwTHPmWc BA= UI-OutboundReport: notjunk:1;M01:P0:8ddz01Fmv1Y=;VfmSTcawai0N2/ykE6rBMWeMz3D 5HSenWEHxjMX/6CuaAF+wu2A3wu4veecWP6I3lB6+cFGVOM74kUPWOHzO1a5X6936+xxDdSkB sUIs5IBnO7XsCa8qiTbR8+UdhfUYPbOzVExvV1RnFeidx3z0NhNm2KW5yRBsYw/So86g5kE+f FOlB5H4713BqF9Pfrp2fIVi4BIW3oirnvuOfc++odSJABLBk3flBAn5Fj1GgSEr2V6Bt8rYqM P4S8+V/r+OU9/dvAdmyve3h+j8IsL0aBi1BrI0yQD07HAUKku6+Jw0XqPR0cBByICBEcqRIWM yTBKUqCJbfI/zN0o2/oCjHs62MO/dWppLilsaTkJ3RDyDaz2qr8RK0PhAtYncjo+30YOKPdDe l2PEHpcbRwP5pZqPiv2NDoh/OBjCMCiMjTnIF7GBzlBQOHnprIm/4AaGgha9eITmajdCCxaFQ k0RWfAE98s6G64ac80TyxjAumThKT28Y8nXWCVbvvCJNUG16Yl9NCeQ02IeH2B7F9J3edrKAz Z7bHL+MXPNzOYeNslS1nl9CdUdq7+QCRvVjZQJ3aVfUjC4o87sxEAar6307I5Ax7k3AsSGhBM lSqebPFoZBWrS/uGNVAF5bxr9dvwJBBK/V5n1zAsGDdARKA3YklVJyzTXAFwxGWiWRbdU/66B FugGXbClnCvI/0IvQFMHg8XXZImgdsvKTCKr3MdQDF5RwRqySa8J2/nsOKufql1xPBrhIFiTr hRKhFQv/LDEYrGPl/PKKaBpgNtj8aGzSMXBkNNrnl9bam2JrikInrOow5sfj0t3XNrb8o8RuA +9dR0XntjwfEbxi/m9Vcb4bg== X-Spam-Status: No, score=-12.8 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 List-Id: --kenitram-190faebd-7fe7-4588-9d6e-89da3930e425 Content-Type: text/plain; charset=UTF-8 Dear all, when comparing formal and actual arguments of a procedure, there was no check of rank for derived types from intrinsic module ISO_C_BINDING. This could lead to a wrong resolution of generic procedures with dummy argument of related types, see PR. This was likely an oversight. The attached fix is simple and regtests cleanly on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald --kenitram-190faebd-7fe7-4588-9d6e-89da3930e425 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr61615.diff Content-Transfer-Encoding: quoted-printable =46rom d41aa0f60b53799a5d28743f168fbf312461f51f Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 10 Apr 2023 22:39:52 +0200 Subject: [PATCH] Fortran: resolve correct generic with TYPE(C_PTR) argumen= ts [PR61615] gcc/fortran/ChangeLog: PR fortran/61615 * interface.cc (compare_parameter): Enable rank check for arguments of derived type from the intrinsic module ISO_C_BINDING. gcc/testsuite/ChangeLog: PR fortran/61615 * gfortran.dg/interface_49.f90: New test. =2D-- gcc/fortran/interface.cc | 14 ++++++- gcc/testsuite/gfortran.dg/interface_49.f90 | 43 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/interface_49.f90 diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index db79b104dc2..8682dc999be 100644 =2D-- a/gcc/fortran/interface.cc +++ b/gcc/fortran/interface.cc @@ -2361,7 +2361,19 @@ compare_parameter (gfc_symbol *formal, gfc_expr *ac= tual, && formal->ts.u.derived && formal->ts.u.derived->ts.is_iso_c && actual->ts.type =3D=3D BT_DERIVED && actual->ts.u.derived && actual->ts.u.derived->ts.is_iso_c) - return true; + { + if (ranks_must_agree + && ((actual->rank =3D=3D 0 && formal->attr.dimension) + || (actual->rank !=3D 0 && !formal->attr.dimension))) + { + if (where) + argument_rank_mismatch (formal->name, &actual->where, + symbol_rank (formal), actual->rank, + NULL); + return false; + } + return true; + } if (formal->ts.type =3D=3D BT_CLASS && actual->ts.type =3D=3D BT_DERIVE= D) /* Make sure the vtab symbol is present when diff --git a/gcc/testsuite/gfortran.dg/interface_49.f90 b/gcc/testsuite/gf= ortran.dg/interface_49.f90 new file mode 100644 index 00000000000..67d3e3f871b =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/interface_49.f90 @@ -0,0 +1,43 @@ +! { dg-do run } +! PR fortran/61615 - resolve correct generic with TYPE(C_PTR) arguments +! Contributed by Jacob Abel + +MODULE foo + USE iso_c_binding, only : c_ptr + IMPLICIT NONE + integer :: rank =3D -99 + INTERFACE bar + MODULE PROCEDURE bar_s + MODULE PROCEDURE bar_a1d + END INTERFACE bar +CONTAINS + SUBROUTINE bar_s(a) + TYPE(c_ptr) :: a + WRITE (0, *) 'in bar_s' + rank =3D 0 + END SUBROUTINE bar_s + + SUBROUTINE bar_a1d(a) + TYPE(c_ptr) :: a(:) + WRITE (0, *) 'in bar_a1d' + rank =3D 1 + END SUBROUTINE bar_a1d +END MODULE foo + +PROGRAM cptr_array_vs_scalar_arg + USE foo + USE iso_c_binding, only : c_ptr, c_loc + IMPLICIT NONE + INTEGER, TARGET :: i + TYPE(c_ptr) :: a, b(1) + a =3D C_LOC(i) + b(1) =3D C_LOC(i) + CALL bar(a) + if (rank /=3D 0) stop 1 + CALL bar(b) + if (rank /=3D 1) stop 2 + CALL bar((a)) + if (rank /=3D 0) stop 3 + CALL bar((b)) + if (rank /=3D 1) stop 4 +END PROGRAM cptr_array_vs_scalar_arg =2D- 2.35.3 --kenitram-190faebd-7fe7-4588-9d6e-89da3930e425--