From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.smtpout.orange.fr (smtp-13.smtpout.orange.fr [80.12.242.13]) by sourceware.org (Postfix) with ESMTPS id 12D263858434 for ; Thu, 13 Jul 2023 08:52:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 12D263858434 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id Js3wqzoJKtImzJs43q0yVU; Thu, 13 Jul 2023 10:52:43 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1689238363; bh=peCu/E1yhlONrTkpagxlff5OaQJaxpY+As0ra6EfrUE=; h=From:To:Subject:Date:In-Reply-To:References; b=RMD3lQ1ku8IKZf+MLFQCCfPk/oliM+pSwmXY/Yfw91RNLo85LvuVcUQzc8AuHvkY1 eksIo8pKRGvfBSkDpUVez8l0cpdJQ5lI3ux94bp5VT4w1/I27HnDkcY8oRfgLNrNer cEhst3dq1OnxOL+BDv8OtgEytBdDSv8FQ5mn0A/kqwHnhL6ooMoh6+oIs4gdHgejZY IBAymbY6e7MbAq15CeQ9Dm/nsfCS3DUu1jkuxc3sA+yaDq+utsZrPwp2/8FnEx9qiJ RP0urJIU7xb5RWyN6pgIaXeu/gfXgStPCnLbTTg8py21bxRKLiWJGeLHTrDMZcZsJE B/OAv43B/23VA== X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Thu, 13 Jul 2023 10:52:43 +0200 X-ME-IP: 86.215.161.51 From: Mikael Morin To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 04/14] fortran: Inline gfc_build_final_call Date: Thu, 13 Jul 2023 10:52:26 +0200 Message-Id: <20230713085236.330222-5-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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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 List-Id: Function gfc_build_final_call has been simplified, inline it. gcc/fortran/ChangeLog: * trans.cc (gfc_build_final_call): Inline... (gfc_add_finalizer_call): ... to its one caller. --- gcc/fortran/trans.cc | 66 +++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc index 9807b7eb9d9..f8ca388ab9f 100644 --- a/gcc/fortran/trans.cc +++ b/gcc/fortran/trans.cc @@ -1201,45 +1201,6 @@ get_var_descr (gfc_se *se, gfc_typespec *ts, gfc_expr *var) -/* Build a call to a FINAL procedure, which finalizes "var". */ - -static tree -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, size_se, desc_se; - tree final_fndecl, array, size, tmp; - - gcc_assert (var); - - gfc_start_block (&block); - - 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; - - gfc_init_se (&size_se, NULL); - get_elem_size (&size_se, &ts, class_size); - gfc_add_block_to_block (&block, &size_se.pre); - size = size_se.expr; - - gfc_init_se (&desc_se, NULL); - get_var_descr (&desc_se, &ts, var); - gfc_add_block_to_block (&block, &desc_se.pre); - array = desc_se.expr; - - tmp = build_call_expr_loc (input_location, - final_fndecl, 3, array, - size, fini_coarray ? boolean_true_node - : boolean_false_node); - gfc_add_block_to_block (&block, &desc_se.post); - gfc_add_expr_to_block (&block, tmp); - return gfc_finish_block (&block); -} - - bool gfc_add_comp_finalizer_call (stmtblock_t *block, tree decl, gfc_component *comp, bool fini_coarray) @@ -1408,8 +1369,31 @@ gfc_add_finalizer_call (stmtblock_t *block, gfc_expr *expr2) gcc_assert (final_expr->expr_type == EXPR_VARIABLE); - tmp = gfc_build_final_call (expr->ts, final_expr, expr, - false, elem_size); + stmtblock_t tmp_block; + gfc_start_block (&tmp_block); + + gfc_se final_se; + gfc_init_se (&final_se, NULL); + get_final_proc_ref (&final_se, final_expr); + gfc_add_block_to_block (&tmp_block, &final_se.pre); + + gfc_se size_se; + gfc_init_se (&size_se, NULL); + get_elem_size (&size_se, &expr->ts, elem_size); + gfc_add_block_to_block (&tmp_block, &size_se.pre); + + gfc_se desc_se; + gfc_init_se (&desc_se, NULL); + get_var_descr (&desc_se, &expr->ts, expr); + gfc_add_block_to_block (&tmp_block, &desc_se.pre); + + tmp = build_call_expr_loc (input_location, final_se.expr, 3, + desc_se.expr, size_se.expr, + boolean_false_node); + + gfc_add_block_to_block (&tmp_block, &desc_se.post); + gfc_add_expr_to_block (&tmp_block, tmp); + tmp = gfc_finish_block (&tmp_block); if (expr->ts.type == BT_CLASS && !has_finalizer) { -- 2.40.1