From patchwork Fri Oct 28 20:12:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 59601 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 1850C3858420 for ; Fri, 28 Oct 2022 20:13:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1850C3858420 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666988029; bh=I1uq3NSHdmQUmspDFKYTmGS1nPpOniUTde2CTOTWyI4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wwg0ZApM25qwrFp1E9G+i0ryiHtbLaWJgLHH43OWOlr59CWAlFZUhFhQ+Q515DWiy 8CSSqH6oxvCqjHSDY5Tu9eSk5/Tx+xgHqLTQS9+vmLqqC/hgWZbsoQSUWG6dVTx2rO zTS71X/csbj4Nx8N6GoXpOxNEwgK/FHtl8RDn67Q= 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.15.15]) by sourceware.org (Postfix) with ESMTPS id 768D13858CDA; Fri, 28 Oct 2022 20:13:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 768D13858CDA X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.232.145.17] ([79.232.145.17]) by web-mail.gmx.net (3c-app-gmx-bs25.server.lan [172.19.170.77]) (via HTTP); Fri, 28 Oct 2022 22:12:59 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: ordering of hidden procedure arguments [PR107441] Date: Fri, 28 Oct 2022 22:12:59 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:2/DiH1gd9s5+9BltfaKPfTqdp7I0A1MeyEJ47sFg8fPtnSVxw2WaiiQsPpAf8RfgFA08D IC8J5VnWRZhoiwL+h0hu24ZTp7airnq96yhkNuIn9Yx3nJiRLjY7l5oNZ8XMsh0Od6SpWw0bcxRv rXUm1FhrCANwZj5EaTf7JkOYz9H5GxRxVtZs5ga3lWbymNOKWa9nK3+4TcxnXvw9iD/Ga07+Psqa T5GOGzUQ044bE7zJfJF4NMjTi0/zzDI0hELv7V+A1pKZaYTp7L+h8DY7ghzku7Kiv0Xw691KOJ9V RI= UI-OutboundReport: notjunk:1;M01:P0:NNaCdPkOEa0=;eSgyga5wJDHXjcRRit/9sduPXJ9 GfNUE+I2yhoRFmAav9UCWc4JJx6dpGX1RyBigZ3jiKCPFVMnfYOUuUveJrVaKHUMGFAJNWaxM ae1HTLozad9J3CuxuLxZHfvAxjrIAW11Q1UH57UwqkUnxggg53VSMSHEKzXc0iTYFxLpHpwup 7yX+5MjMfptC37a8Rms2fYbxdXZ1ku7Md0pXevdVbxJgXCJUdrP+pEtBwvzpemHtn94hkGDVm 0FjWbuEn0g4pll/fk9k4J/WZ6Ag3vv88APCchRd9s+2HaMqe4Q6/MMyqfefrdsZ3DBf2CETK5 ybmZE3HFzqs+/X7JTyPzbw2/cbCw1jpTHLeTu8EIYjjnlyXSt/bXF4DCik+/jhLAwQ73DyJ4n rhOporGccgK7HYuV1SEa6bG5hxMMCFx2euGcOLOFjHupq2GMcPHK9pntnCbMAYysvAittEMjG FX4E0wydlhI1GA+qqsv8dGJFgDJ+O8YxrvrmzZ1uNbmblJaAEVknLlj6d0GJ0y58TrpZ3H+9A TWbevKOPySVMJzzq9D9qwiPRhoBtqJEhWF5ElQE5UBjyzYUky7zVyoatxI9ksfkXei2upYUeZ xdnluFeD2ZaHp8e3GOuuHD//+XFwgPFNghoC8RofMu5vI10rQoJ+5psiaHCHnYOB2m0XQIBN+ Din7CAG6Tf7ZFX/BPaRcZ9fPQcgtO4J87LyPqlTEL4iQuIn/KAW4JqfpAZ1KI/j3aslPGEOQW nYD0cMGNdDD//DOvEjLwi504EesQX4ZfCb/D+24OaUuLkTsDbV1xaqYlClHn0WXICdaEJHh/H h6l3pzFEInFrdZLGGGrd2DVBMeDY4QqQhj8tyEuJfcWUE= X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, 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 passing of procedure arguments in Fortran sometimes requires ancillary parameters that are "hidden". Examples are string length and the presence status of scalar variables with optional+value attribute. The gfortran ABI is actually documented: https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html The reporter found that there was a discrepancy between the caller and the callee. This is corrected by the attached patch. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From b7646403557eca19612c81437f381d4b4dcd51c8 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Fri, 28 Oct 2022 21:58:08 +0200 Subject: [PATCH] Fortran: ordering of hidden procedure arguments [PR107441] gcc/fortran/ChangeLog: PR fortran/107441 * trans-decl.cc (create_function_arglist): Adjust the ordering of automatically generated hidden procedure arguments to match the documented ABI for gfortran. gcc/testsuite/ChangeLog: PR fortran/107441 * gfortran.dg/optional_absent_6.f90: New test. --- gcc/fortran/trans-decl.cc | 15 +++-- .../gfortran.dg/optional_absent_6.f90 | 60 +++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/optional_absent_6.f90 diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc index 63515b9072a..18842fe2c4b 100644 --- a/gcc/fortran/trans-decl.cc +++ b/gcc/fortran/trans-decl.cc @@ -2508,7 +2508,7 @@ create_function_arglist (gfc_symbol * sym) tree fndecl; gfc_formal_arglist *f; tree typelist, hidden_typelist; - tree arglist, hidden_arglist; + tree arglist, hidden_arglist, optional_arglist, strlen_arglist; tree type; tree parm; @@ -2518,6 +2518,7 @@ create_function_arglist (gfc_symbol * sym) the new FUNCTION_DECL node. */ arglist = NULL_TREE; hidden_arglist = NULL_TREE; + strlen_arglist = optional_arglist = NULL_TREE; typelist = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); if (sym->attr.entry_master) @@ -2644,7 +2645,7 @@ create_function_arglist (gfc_symbol * sym) length = build_decl (input_location, PARM_DECL, get_identifier (name), len_type); - hidden_arglist = chainon (hidden_arglist, length); + strlen_arglist = chainon (strlen_arglist, length); DECL_CONTEXT (length) = fndecl; DECL_ARTIFICIAL (length) = 1; DECL_ARG_TYPE (length) = len_type; @@ -2712,7 +2713,7 @@ create_function_arglist (gfc_symbol * sym) PARM_DECL, get_identifier (name), boolean_type_node); - hidden_arglist = chainon (hidden_arglist, tmp); + optional_arglist = chainon (optional_arglist, tmp); DECL_CONTEXT (tmp) = fndecl; DECL_ARTIFICIAL (tmp) = 1; DECL_ARG_TYPE (tmp) = boolean_type_node; @@ -2863,10 +2864,16 @@ create_function_arglist (gfc_symbol * sym) typelist = TREE_CHAIN (typelist); } + /* Add hidden present status for optional+value arguments. */ + arglist = chainon (arglist, optional_arglist); + /* Add the hidden string length parameters, unless the procedure is bind(C). */ if (!sym->attr.is_bind_c) - arglist = chainon (arglist, hidden_arglist); + arglist = chainon (arglist, strlen_arglist); + + /* Add hidden extra arguments for the gfortran library. */ + arglist = chainon (arglist, hidden_arglist); gcc_assert (hidden_typelist == NULL_TREE || TREE_VALUE (hidden_typelist) == void_type_node); diff --git a/gcc/testsuite/gfortran.dg/optional_absent_6.f90 b/gcc/testsuite/gfortran.dg/optional_absent_6.f90 new file mode 100644 index 00000000000..b8abb06980a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/optional_absent_6.f90 @@ -0,0 +1,60 @@ +! { dg-do run } +! PR fortran/107441 +! +! Test VALUE + OPTIONAL for integer/real/... +! in the presence of non-optional character dummies + +program bugdemo + implicit none + character :: s = 'a' + integer :: t + + t = testoptional(s) + call test2 (s) + call test3 (s) + call test4 (w='123',x=42) + +contains + + function testoptional (w, x) result(t) + character, intent(in) :: w + integer, intent(in), value, optional :: x + integer :: t + print *, 'present(x) is', present(x) + t = 0 + if (present (x)) stop 1 + end function testoptional + + subroutine test2 (w, x) + character, intent(in) :: w + integer, intent(in), value, optional :: x + print*, 'present(x) is', present(x) + if (present (x)) stop 2 + end subroutine test2 + + subroutine test3 (w, x) + character, intent(in), optional :: w + integer, intent(in), value, optional :: x + print *, 'present(w) is', present(w) + print *, 'present(x) is', present(x) + if (.not. present (w)) stop 3 + if (present (x)) stop 4 + end subroutine test3 + + subroutine test4 (r, w, x) + real, value, optional :: r + character(*), intent(in), optional :: w + integer, value, optional :: x + print *, 'present(r) is', present(r) + print *, 'present(w) is', present(w) + print *, 'present(x) is', present(x) + if (present (r)) stop 5 + if (.not. present (w)) stop 6 + if (.not. present (x)) stop 7 + print *, 'x=', x + print *, 'len(w)=', len(w) + if (len(w) /= 3) stop 8 + if (x /= 42) stop 9 + end subroutine test4 + +end program bugdemo -- 2.35.3