From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.smtpout.orange.fr (smtp-23.smtpout.orange.fr [80.12.242.23]) by sourceware.org (Postfix) with ESMTPS id C218C3858C20 for ; Tue, 8 Nov 2022 10:32:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C218C3858C20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=orange.fr Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=orange.fr Received: from [192.168.1.17] ([83.197.245.49]) by smtp.orange.fr with ESMTPA id sLtyokapQ4lbwsLuDoIhBB; Tue, 08 Nov 2022 11:32:34 +0100 X-ME-Helo: [192.168.1.17] X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Tue, 08 Nov 2022 11:32:34 +0100 X-ME-IP: 83.197.245.49 Message-ID: <54c4f997-863d-f850-ddf9-1ed780feedff@orange.fr> Date: Tue, 8 Nov 2022 11:32:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 From: Mikael Morin Subject: Re: [PATCH, v3] Fortran: ordering of hidden procedure arguments [PR107441] To: Harald Anlauf , fortran@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org References: <7d8ddf07-e66d-2678-de99-0e575c70ea17@orange.fr> <327319ac-4ef9-1e48-e993-57113d802d3b@orange.fr> <85a5951a-7ea4-57b3-895a-ff7dbf1ef92e@orange.fr> <93a5f029-4411-3424-f6ee-3b2bcf210050@gmx.de> <8725411a-979b-dd53-d1fe-5b041482a8eb@gmx.de> <91afe6ef-e5f4-d3d8-ad15-3271fd4e61cd@orange.fr> <3ca46ea0-ee6a-cbc6-d3af-99b8db698307@orange.fr> <24c6acfa-6745-c7a3-4bbd-54bd0fa31454@gmx.de> Content-Language: en-US In-Reply-To: <24c6acfa-6745-c7a3-4bbd-54bd0fa31454@gmx.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: Hello, Le 07/11/2022 à 22:45, Harald Anlauf via Fortran a écrit : > Dear all, > > Am 04.11.22 um 10:53 schrieb Mikael Morin: >> Le 03/11/2022 à 23:03, Harald Anlauf a écrit : >>> I've spent some time not only staring at create_function_arglist, >>> but trying several variations handling the declared hidden parms, >>> and applying the necessary adjustments to gfc_get_function_type. >>> (Managing linked trees is not the issue, just understanding them.) >>> I've been unable to get the declarations in sync, and would need >>> help how to debug the mess I've created.  Dropping my patch for >>> the time being. >>> >> If you want, we can meet on IRC somewhen (tonight?). > > armed with the new knowledge, I could now understand what > (more or less) trivially went wrong with my previous patch. > > The attached patch remedies that: gfc_get_function_type() now > properly separates the types of the hidden parameters so that > optional+value comes before string length and caf stuff, > while in create_function_arglist we simply need to split > the walking over the typelists so that the optional+value > stuff, which is basically just booleans, is done separately > from the other parts. > > Looking at the tree-dumps, the function decls now seem to be > fine at least for the given testcases.  I've adjusted one of > the testcases to validate this. > > Regtests fine on x86_64-pc-linux-gnu.  OK for mainline? > this is mostly good. There is one last corner case that is not properly handled: > diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc > index 63515b9072a..94988b8690e 100644 > --- a/gcc/fortran/trans-decl.cc > +++ b/gcc/fortran/trans-decl.cc (...) > @@ -2619,6 +2620,15 @@ create_function_arglist (gfc_symbol * sym) > if (f->sym != NULL) /* Ignore alternate returns. */ > hidden_typelist = TREE_CHAIN (hidden_typelist); > > + /* Advance hidden_typelist over optional+value argument presence flags. */ > + optval_typelist = hidden_typelist; > + for (f = gfc_sym_get_dummy_args (sym); f; f = f->next) > + if (f->sym != NULL > + && f->sym->attr.optional && f->sym->attr.value > + && !f->sym->attr.dimension && f->sym->ts.type != BT_CLASS > + && !gfc_bt_struct (f->sym->ts.type)) > + hidden_typelist = TREE_CHAIN (hidden_typelist); > + This new loop copies the condition guarding the handling of optional value presence arguments, except that the condition is in an "else if", and the complement of the condition in the corresponding "if" is missing, to have strictly the same conditions. Admittedly, it only makes a difference for character optional value arguments, which are hardly working. At least they work as long as one doesn't try to query their presence. Below is a case regressing with your patch. With that fixed, I think it's good for mainline. Thanks for your patience. ! { dg-do compile } ! ! PR fortran/107441 ! Check that procedure types and procedure decls match when the procedure ! has both character-typed and character-typed optional value args. ! ! Contributed by M.Morin program p interface subroutine i(c, o) character(*) :: c character(3), optional, value :: o end subroutine i end interface procedure(i), pointer :: pp pp => s call pp("abcd", "xyz") contains subroutine s(c, o) character(*) :: c character(3), optional, value :: o if (o /= "xyz") stop 1 if (c /= "abcd") stop 2 end subroutine s end program p