From: Mikael Morin <mikael@gcc.gnu.org>
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 [thread overview]
Message-ID: <20230713085236.330222-5-mikael@gcc.gnu.org> (raw)
In-Reply-To: <20230713085236.330222-1-mikael@gcc.gnu.org>
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
next prev parent reply other threads:[~2023-07-13 8:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 8:52 [PATCH 00/14] fortran: Use precalculated class container for deallocation [PR110618] Mikael Morin
2023-07-13 8:52 ` [PATCH 01/14] fortran: Outline final procedure pointer evaluation Mikael Morin
2023-07-13 8:52 ` [PATCH 02/14] fortran: Outline element size evaluation Mikael Morin
2023-07-13 8:52 ` [PATCH 03/14] fortran: Outline data reference descriptor evaluation Mikael Morin
2023-07-13 8:52 ` Mikael Morin [this message]
2023-07-13 8:52 ` [PATCH 05/14] fortran: Add missing cleanup blocks Mikael Morin
2023-07-13 8:52 ` [PATCH 06/14] fortran: Reuse final procedure pointer expression Mikael Morin
2023-07-13 8:52 ` [PATCH 07/14] fortran: Push element size expression generation close to its usage Mikael Morin
2023-07-13 8:52 ` [PATCH 08/14] fortran: Push final procedure expr gen close to its one usage Mikael Morin
2023-07-13 8:52 ` [PATCH 09/14] fortran: Inline variable definition Mikael Morin
2023-07-13 8:52 ` [PATCH 10/14] fortran: Remove redundant argument in get_var_descr Mikael Morin
2023-07-13 8:52 ` [PATCH 11/14] fortran: Outline virtual table pointer evaluation Mikael Morin
2023-07-13 8:52 ` [PATCH 12/14] fortran: Factor scalar descriptor generation Mikael Morin
2023-07-13 8:52 ` [PATCH 13/14] fortran: Use pre-evaluated class container if available [PR110618] Mikael Morin
2023-07-13 8:52 ` [PATCH 14/14] fortran: Pass pre-calculated class container argument [pr110618] Mikael Morin
2023-07-14 5:55 ` Paul Richard Thomas
2023-07-14 7:43 ` Mikael Morin
2023-07-13 18:40 ` [PATCH 00/14] fortran: Use precalculated class container for deallocation [PR110618] Paul Richard Thomas
2023-07-15 6:11 ` Paul Richard Thomas
2023-07-15 10:08 ` Mikael Morin
2023-07-16 17:09 ` Mikael Morin
2023-07-17 6:12 ` Paul Richard Thomas
2023-07-17 17:43 ` Mikael Morin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230713085236.330222-5-mikael@gcc.gnu.org \
--to=mikael@gcc.gnu.org \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).