From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ciao.gmane.io (ciao.gmane.io [116.202.254.214]) by sourceware.org (Postfix) with ESMTPS id 690A03858C2D for ; Sun, 11 Feb 2024 20:11:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 690A03858C2D Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=m.gmane-mx.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 690A03858C2D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=116.202.254.214 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707682299; cv=none; b=b6J2JGUZlq/aT/UcDSf2GWK9ipCDPSDlahBYpHOPssqqILuQ826VqVXVTnJiopVBMJBs1L+KI++d7wxs31NFJGcbW5/UCIXXC7LdSv93UHUu02zc8LQw8fIHUPg7UjUIozUfZv5yhanUrB4IMjkNwmG36g7LKsvZM+MiE3ZdMxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707682299; c=relaxed/simple; bh=JYMx6DuaWRMrGzK4LedYBxbtecaQN3NuAGcRy3CRY+s=; h=To:From:Subject:Date:Message-ID:Mime-Version; b=gS0Y/WBLHcF6+y9K2ApjkCYQumSFEVWX5UUHBBdynvQ5jrZBFxhCm5xdxa+M1zEBuQTvi/wxczJ0ZJNlhxTlaMOMiBGmr/eF2MUyTO5+GrHYaH4ZUgPCvoVtXRGDBfcLe/Q+QV3LY+VHI39G9ilFay9MBQ4Hv2YjT4rHHQMesao= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1rZGAp-0008Uj-6P for gcc-patches@gcc.gnu.org; Sun, 11 Feb 2024 21:11:35 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: gcc-patches@gcc.gnu.org From: Harald Anlauf Subject: Re: [PATCH] Fortran - Error compiling PDT Type-bound Procedures [PR82943/86148/86268] Date: Sun, 11 Feb 2024 21:11:27 +0100 Message-ID: <5a4694d0-c610-4297-8255-77a15cda92c4@gmx.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla Thunderbird Content-Language: en-US In-Reply-To: Cc: fortran@gcc.gnu.org X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Message-ID: <20240211201127.oKHFUKtf_ITexfP-QedhRVJAtDM0FZ_PDIRLZsimpEY@z> Hi Alex, I've been unable to apply your patch to my local trunk, likely due to whitespace issues my newsreader handles differently from your site. I see it inline instead of attached. A few general remarks: Please follow the general recommendation regarding style if possible, see https://www.gnu.org/prep/standards/standards.html#Formatting regarding formatting/whitespace use (5.1) and comments (5.2) Also, when an error message text spans multiple lines, please place the whitespace at the end of a line, not at the beginning of the new one: > + if ( resolve_bindings_derived->attr.pdt_template && > + !gfc_pdt_is_instance_of(resolve_bindings_derived, > + CLASS_DATA(me_arg)->ts.u.derived)) > + { > + gfc_error ("Argument %qs of %qs with PASS(%s) at %L must be of" > + " the parametric derived-type %qs", me_arg->name, proc->name, gfc_error ("Argument %qs of %qs with PASS(%s) at %L must be of " "the parametric derived-type %qs", me_arg->name, proc->name, > + me_arg->name, &where, resolve_bindings_derived->name); > + goto error; > + } The following change is almost unreadable: the lnegthy comment is split over three parts and almost hides the code. Couldn't this be combined into one comment before the function? > diff --git a/gcc/fortran/symbol.cc b/gcc/fortran/symbol.cc > index fddf68f8398..11f4bac0415 100644 > --- a/gcc/fortran/symbol.cc > +++ b/gcc/fortran/symbol.cc > @@ -5172,6 +5172,35 @@ gfc_type_is_extension_of (gfc_symbol *t1, gfc_symbol > *t2) > return gfc_compare_derived_types (t1, t2); > } > > +/* Check if a parameterized derived type t2 is an instance of a PDT > template t1 */ > + > +bool > +gfc_pdt_is_instance_of(gfc_symbol *t1, gfc_symbol *t2) > +{ > + if ( !t1->attr.pdt_template || !t2->attr.pdt_type ) > + return false; > + > + /* > + in decl.cc, gfc_get_pdt_instance, a pdt instance is given a 3 > character prefix "Pdt", followed > + by an underscore list of the kind parameters, up to a maximum of 8. > + > + So to check if a PDT Type corresponds to the template, extract the > core derive_type name, > + and then see if it is type compatible by name... > + > + For example: > + > + Pdtf_2_2 -> extract out the 'f' -> see if the derived type 'f' is > compatible with symbol t1 > + */ > + > + // Starting at index 3 of the string in order to skip past the 'Pdt' > prefix > + // Also, here the length of the template name is used in order to avoid > the > + // kind parameter suffixes that are placed at the end of PDT instance > names. > + if ( !(strncmp(&(t2->name[3]), t1->name, strlen(t1->name)) == 0) ) > + return false; > + > + return true; > +} > + > > /* Check if two typespecs are type compatible (F03:5.1.1.2): > If ts1 is nonpolymorphic, ts2 must be the same type. The following testcase tests for errors. I tried Intel and NAG on it after commenting the 'contains' section of the type desclaration. Both complained about subroutine deferred_len_param, e.g. Intel: A colon may only be used as a type parameter value in the declaration of an object that has the POINTER or ALLOCATABLE attribute. [THIS] class(param_deriv_type(:)), intent(inout) :: this NAG: Entity THIS of type PARAM_DERIV_TYPE(A=:) has a deferred length type parameter but is not a data pointer or allocatable Do we detect this after your patch? If the answer is yes, can we add another subroutine where we check for this error? (the dg-error suggests we only expect assumed len type parameters.) If no, maybe add a comment in the testcase that this subroutine may need updating later. > diff --git a/gcc/testsuite/gfortran.dg/pdt_37.f03 > b/gcc/testsuite/gfortran.dg/pdt_37.f03 > new file mode 100644 > index 00000000000..68d376fad25 > --- /dev/null > +++ b/gcc/testsuite/gfortran.dg/pdt_37.f03 > @@ -0,0 +1,34 @@ > +! { dg-do compile } > +! > +! Tests the fixes for PR82943. > +! > +! This test focuses on the errors produced by incorrect LEN parameters for > dummy > +! arguments of PDT Typebound Procedures. > +! > +! Contributed by Alexander Westbrooks > +! > +module test_len_param > + > + type :: param_deriv_type(a) > + integer, len :: a > + contains > + procedure :: assumed_len_param ! Good. No error expected. > + procedure :: deferred_len_param ! { dg-error "All LEN type > parameters of the passed dummy argument" } > + procedure :: fixed_len_param ! { dg-error "All LEN type > parameters of the passed dummy argument" } > + end type > + > +contains > + subroutine assumed_len_param(this) > + class(param_deriv_type(*)), intent(inout) :: this > + end subroutine > + > + subroutine deferred_len_param(this) > + class(param_deriv_type(:)), intent(inout) :: this > + end subroutine > + > + subroutine fixed_len_param(this) > + class(param_deriv_type(10)), intent(inout) :: this > + end subroutine > + > +end module > +