From patchwork Thu Jul 13 08:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 119669 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1684310vqm; Thu, 13 Jul 2023 01:55:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHF2Qn9ATMFZK/wHk+ovW7+2hhpBqGKkjx5N3OLFqkBsJqD0oSpicvDdptLA0bzSZA6CLYv X-Received: by 2002:a2e:9d84:0:b0:2b6:e76b:1e50 with SMTP id c4-20020a2e9d84000000b002b6e76b1e50mr862696ljj.41.1689238519949; Thu, 13 Jul 2023 01:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689238519; cv=none; d=google.com; s=arc-20160816; b=OkOAO+RdAiAqIinsnzyowgk1EpRbxCeD2l3qeYpjhMb5Bug91OBmc+YZIm3/33KP0U kzGWrU8XxAV0Cbn3NIlcYlADmFgKkXcg0Fm4RykmNhQPp6X6hAHhl7VbcylYNSbC+ug7 L/jmIdliTAjoMbZ4fwYbbTQklcb7FmaQNaB6/CtrKqFp9fr7xaOCndIKUhYfAr87ekn0 i3QIoYvOgsM6OZSLnwFz7S5XFtCtLY73bjRSJeDlDPEM25AHg9NA6Ignd9t0XIO4hhFF Q/9X8Z0rxraU3qw7B2dtT07RcweTdpQTmMcgWxyrugKhj9JMyyVBpj47vBg52j/bpR58 CHiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=oLjNZRwgrdxP0l7wa+m3NfAgGRPCXpHJnyNtZ9xV1hY=; fh=EAqAZnhg4AYtcBjfPm18lEF5V0R2rkI9MSWQf+svVaI=; b=00+J9I/27Kgn54tCEqrX/WcTCzj6rIZdxtKl0H9QHsT5Or3UReeT8vfdSx0225sNMr YNIBZFps7ZemnH6S2gOJXe2k8nzkHx/hbfDUG4LLlbos9hxeijKFW9u/OctUGW4cVWsF 6FfgN1TUszqATMGvoC2W/8G1bHZhhVK3nNoEWF3QbCXq0CIAPY9S9/2mSbq+6KFCF7iG HW3Udem7C+q2BBXTX07FNtpiSMY0/UYu/SNcweWpsSWg3xmdprkUgRY4b/h44PTUxiLA YWkPFiPKRMPcasqKsAPJK0vFQITq2AWFALDIMwyCFEa0g9xl/H3ZdhgqtUTMd14nOVRq wb2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dxYAbz8R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id by18-20020a170906a2d200b0098d807c0e8fsi6770298ejb.264.2023.07.13.01.55.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 01:55:19 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dxYAbz8R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0114F3852656 for ; Thu, 13 Jul 2023 08:53:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0114F3852656 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689238425; bh=oLjNZRwgrdxP0l7wa+m3NfAgGRPCXpHJnyNtZ9xV1hY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=dxYAbz8R8DMZzXV+Rz5b017IlF4Zvmm9MwtP1U5YXdOZYcpFKMJbH75z4Vy90A3Y8 CJ1qDDL6UxUicqtdeBveLly4y37PXow74k/lzh7JFeIeNPfa+Fcfl5y+toTbQRLW2d yK26WbAQ/OL65sKa1wpoPJACIC41+UJVKbgDkynI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.smtpout.orange.fr (smtp-13.smtpout.orange.fr [80.12.242.13]) by sourceware.org (Postfix) with ESMTPS id DB8733858C41 for ; Thu, 13 Jul 2023 08:52:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB8733858C41 Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id Js3wqzoJKtImzJs42q0yVK; Thu, 13 Jul 2023 10:52:42 +0200 X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Thu, 13 Jul 2023 10:52:42 +0200 X-ME-IP: 86.215.161.51 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 01/14] fortran: Outline final procedure pointer evaluation Date: Thu, 13 Jul 2023 10:52:23 +0200 Message-Id: <20230713085236.330222-2-mikael@gcc.gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713085236.330222-1-mikael@gcc.gnu.org> References: <20230713085236.330222-1-mikael@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE 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: Mikael Morin via Gcc-patches From: Mikael Morin Reply-To: Mikael Morin Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771294970666952652 X-GMAIL-MSGID: 1771294970666952652 gcc/fortran/ChangeLog: * trans.cc (get_final_proc_ref): New function. (gfc_build_final_call): Outline the pointer evaluation code to get_final_proc_ref. --- gcc/fortran/trans.cc | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc index f1a3aacd850..b5f7b16eda3 100644 --- a/gcc/fortran/trans.cc +++ b/gcc/fortran/trans.cc @@ -1085,6 +1085,21 @@ gfc_call_free (tree var) } +/* Generate the data reference to the finalization procedure pointer passed as + argument in FINAL_WRAPPER. */ + +static void +get_final_proc_ref (gfc_se *se, gfc_expr *final_wrapper) +{ + gcc_assert (final_wrapper->expr_type == EXPR_VARIABLE); + + gfc_conv_expr (se, final_wrapper); + + if (POINTER_TYPE_P (TREE_TYPE (se->expr))) + se->expr = build_fold_indirect_ref_loc (input_location, se->expr); +} + + /* Build a call to a FINAL procedure, which finalizes "var". */ static tree @@ -1092,19 +1107,19 @@ gfc_build_final_call (gfc_typespec ts, gfc_expr *final_wrapper, gfc_expr *var, bool fini_coarray, gfc_expr *class_size) { stmtblock_t block; + gfc_se final_se; gfc_se se; tree final_fndecl, array, size, tmp; symbol_attribute attr; - gcc_assert (final_wrapper->expr_type == EXPR_VARIABLE); gcc_assert (var); gfc_start_block (&block); - gfc_init_se (&se, NULL); - gfc_conv_expr (&se, final_wrapper); - final_fndecl = se.expr; - if (POINTER_TYPE_P (TREE_TYPE (final_fndecl))) - final_fndecl = build_fold_indirect_ref_loc (input_location, final_fndecl); + + gfc_init_se (&final_se, NULL); + get_final_proc_ref (&final_se, final_wrapper); + gfc_add_block_to_block (&block, &final_se.pre); + final_fndecl = final_se.expr; if (ts.type == BT_DERIVED) {