From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by sourceware.org (Postfix) with ESMTPS id DBE953858C74 for ; Thu, 13 Jul 2023 08:52:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DBE953858C74 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 Js3wqzoJKtImzJs43q0yVO; 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=BzqHr3hrvLxaKMHiLjF9Tcm9sNzrf5imjeNguchuaH0=; h=From:To:Subject:Date:In-Reply-To:References; b=qSv5Fi/MMkGnR9wwZsaCZxvvO0fsIXbh9qKkpx1+Xo53QFQBCy8JNPGG8AoVCcQuo eseKw9rjYtL2o5ohLenf2V/Rr8shAcc9PYdLc49Tbr/OkzfmTlNygbmD8LzyAXZjwl JMhijR11qq/U56GOgyQKY74/VVCy7VLtRgVVBmnABbf9VEhqOzMcsdWV4Ezm6OGoPp Zspap0+InY4bnV+PpaMTpbuUxJ9XUm3sBJ823AbfkYWXOJEbE3CfbtzhF8vb/KuqAf 2yWZgM9ri9yly0apk84M+FEaf4QlfNWOUl/vIEvsIg5tpYgnTsEPJrQmvXAGXVkx8n YacUFbnDhx+Xw== 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 02/14] fortran: Outline element size evaluation Date: Thu, 13 Jul 2023 10:52:24 +0200 Message-Id: <20230713085236.330222-3-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.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_H3,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: gcc/fortran/ChangeLog: * trans.cc (get_elem_size): New function. (gfc_build_final_call): Outline the element size evaluation to get_elem_size. --- gcc/fortran/trans.cc | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc index b5f7b16eda3..1e4779f94af 100644 --- a/gcc/fortran/trans.cc +++ b/gcc/fortran/trans.cc @@ -1100,6 +1100,30 @@ get_final_proc_ref (gfc_se *se, gfc_expr *final_wrapper) } +/* Generate the code to obtain the value of the element size whose expression + is passed as argument in CLASS_SIZE. */ + +static void +get_elem_size (gfc_se *se, gfc_typespec *ts, gfc_expr *class_size) +{ + gcc_assert (ts->type == BT_DERIVED || ts->type == BT_CLASS); + + if (ts->type == BT_DERIVED) + { + gcc_assert (!class_size); + se->expr = gfc_typenode_for_spec (ts); + se->expr = TYPE_SIZE_UNIT (se->expr); + se->expr = fold_convert (gfc_array_index_type, se->expr); + } + else + { + gcc_assert (class_size); + gfc_conv_expr (se, class_size); + gcc_assert (se->post.head == NULL_TREE); + } +} + + /* Build a call to a FINAL procedure, which finalizes "var". */ static tree @@ -1107,7 +1131,7 @@ 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 final_se, size_se; gfc_se se; tree final_fndecl, array, size, tmp; symbol_attribute attr; @@ -1121,15 +1145,13 @@ gfc_build_final_call (gfc_typespec ts, gfc_expr *final_wrapper, gfc_expr *var, 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; + if (ts.type == BT_DERIVED) { - tree elem_size; - - gcc_assert (!class_size); - elem_size = gfc_typenode_for_spec (&ts); - elem_size = TYPE_SIZE_UNIT (elem_size); - size = fold_convert (gfc_array_index_type, elem_size); - gfc_init_se (&se, NULL); se.want_pointer = 1; if (var->rank) @@ -1155,12 +1177,6 @@ gfc_build_final_call (gfc_typespec ts, gfc_expr *final_wrapper, gfc_expr *var, else { gfc_expr *array_expr; - gcc_assert (class_size); - gfc_init_se (&se, NULL); - gfc_conv_expr (&se, class_size); - gfc_add_block_to_block (&block, &se.pre); - gcc_assert (se.post.head == NULL_TREE); - size = se.expr; array_expr = gfc_copy_expr (var); gfc_init_se (&se, NULL); -- 2.40.1