From: Paul Richard Thomas <paul.richard.thomas@gmail.com>
To: Mikael Morin <mikael@gcc.gnu.org>
Cc: fortran@gcc.gnu.org
Subject: Re: [PATCH 14/14] fortran: Pass pre-calculated class container argument [pr110618]
Date: Fri, 14 Jul 2023 06:55:06 +0100 [thread overview]
Message-ID: <CAGkQGi+vmg59fG+R_mJfdpANDJau9B2Jng=Cp0=VDVy1QLSExw@mail.gmail.com> (raw)
In-Reply-To: <20230713085236.330222-15-mikael@gcc.gnu.org>
Hi Mikhail,
This patch uses a field for gfc_se called class container, which is
neither declared nor set as far as I can tell.
Regards
Paul
On Thu, 13 Jul 2023 at 10:05, Mikael Morin via Fortran
<fortran@gcc.gnu.org> wrote:
>
> Pass already evaluated class container argument from
> gfc_conv_procedure_call down to gfc_add_finalizer_call through
> gfc_deallocate_scalar_with_status and gfc_deallocate_with_status,
> to avoid repeatedly evaluating the same data reference expressions
> in the generated code.
>
> PR fortran/110618
>
> gcc/fortran/ChangeLog:
>
> * trans.h (gfc_deallocate_with_status): Add class container
> argument.
> (gfc_deallocate_scalar_with_status): Ditto.
> * trans.cc (gfc_deallocate_with_status): Add class container
> argument and pass it down to gfc_add_finalize_call.
> (gfc_deallocate_scalar_with_status): Same.
> * trans-array.cc (structure_alloc_comps): Update caller.
> * trans-stmt.cc (gfc_trans_deallocate): Ditto.
> * trans-expr.cc (gfc_conv_procedure_call): Ditto. Pass
> pre-evaluated class container argument if it's available.
>
> gcc/testsuite/ChangeLog:
>
> * gfortran.dg/intent_out_22.f90: New test.
> ---
> gcc/fortran/trans-array.cc | 2 +-
> gcc/fortran/trans-expr.cc | 7 ++--
> gcc/fortran/trans-stmt.cc | 3 +-
> gcc/fortran/trans.cc | 11 +++---
> gcc/fortran/trans.h | 7 ++--
> gcc/testsuite/gfortran.dg/intent_out_22.f90 | 37 +++++++++++++++++++++
> 6 files changed, 55 insertions(+), 12 deletions(-)
> create mode 100644 gcc/testsuite/gfortran.dg/intent_out_22.f90
>
> diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc
> index 1c2af55d436..951cecfa5d5 100644
> --- a/gcc/fortran/trans-array.cc
> +++ b/gcc/fortran/trans-array.cc
> @@ -9472,7 +9472,7 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl, tree dest,
>
> tmp = gfc_deallocate_with_status (comp, NULL_TREE, NULL_TREE,
> NULL_TREE, NULL_TREE, true,
> - NULL, caf_dereg_mode,
> + NULL, caf_dereg_mode, NULL_TREE,
> add_when_allocated, caf_token);
>
> gfc_add_expr_to_block (&tmpblock, tmp);
> diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
> index dbb04f8c434..8258543b456 100644
> --- a/gcc/fortran/trans-expr.cc
> +++ b/gcc/fortran/trans-expr.cc
> @@ -6706,9 +6706,10 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
> if (e->ts.type == BT_CLASS)
> ptr = gfc_class_data_get (ptr);
>
> + tree cls = parmse.class_container;
> tmp = gfc_deallocate_scalar_with_status (ptr, NULL_TREE,
> NULL_TREE, true,
> - e, e->ts);
> + e, e->ts, cls);
> gfc_add_expr_to_block (&block, tmp);
> tmp = fold_build2_loc (input_location, MODIFY_EXPR,
> void_type_node, ptr,
> @@ -6900,10 +6901,12 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
> ptr = parmse.expr;
> ptr = gfc_class_data_get (ptr);
>
> + tree cls = parmse.class_container;
> tmp = gfc_deallocate_with_status (ptr, NULL_TREE,
> NULL_TREE, NULL_TREE,
> NULL_TREE, true, e,
> - GFC_CAF_COARRAY_NOCOARRAY);
> + GFC_CAF_COARRAY_NOCOARRAY,
> + cls);
> gfc_add_expr_to_block (&block, tmp);
> tmp = fold_build2_loc (input_location, MODIFY_EXPR,
> void_type_node, ptr,
> diff --git a/gcc/fortran/trans-stmt.cc b/gcc/fortran/trans-stmt.cc
> index 7e768343a57..93f36bfb955 100644
> --- a/gcc/fortran/trans-stmt.cc
> +++ b/gcc/fortran/trans-stmt.cc
> @@ -7462,7 +7462,8 @@ gfc_trans_deallocate (gfc_code *code)
> {
> tmp = gfc_deallocate_scalar_with_status (se.expr, pstat, label_finish,
> false, al->expr,
> - al->expr->ts, is_coarray);
> + al->expr->ts, NULL_TREE,
> + is_coarray);
> gfc_add_expr_to_block (&se.pre, tmp);
>
> /* Set to zero after deallocation. */
> diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc
> index 18965b9cbd2..569fad45031 100644
> --- a/gcc/fortran/trans.cc
> +++ b/gcc/fortran/trans.cc
> @@ -1777,8 +1777,8 @@ tree
> gfc_deallocate_with_status (tree pointer, tree status, tree errmsg,
> tree errlen, tree label_finish,
> bool can_fail, gfc_expr* expr,
> - int coarray_dealloc_mode, tree add_when_allocated,
> - tree caf_token)
> + int coarray_dealloc_mode, tree class_container,
> + tree add_when_allocated, tree caf_token)
> {
> stmtblock_t null, non_null;
> tree cond, tmp, error;
> @@ -1872,7 +1872,7 @@ gfc_deallocate_with_status (tree pointer, tree status, tree errmsg,
> gfc_start_block (&non_null);
> if (add_when_allocated)
> gfc_add_expr_to_block (&non_null, add_when_allocated);
> - gfc_add_finalizer_call (&non_null, expr);
> + gfc_add_finalizer_call (&non_null, expr, class_container);
> if (coarray_dealloc_mode == GFC_CAF_COARRAY_NOCOARRAY
> || flag_coarray != GFC_FCOARRAY_LIB)
> {
> @@ -1977,7 +1977,8 @@ gfc_deallocate_with_status (tree pointer, tree status, tree errmsg,
> tree
> gfc_deallocate_scalar_with_status (tree pointer, tree status, tree label_finish,
> bool can_fail, gfc_expr* expr,
> - gfc_typespec ts, bool coarray)
> + gfc_typespec ts, tree class_container,
> + bool coarray)
> {
> stmtblock_t null, non_null;
> tree cond, tmp, error;
> @@ -2030,7 +2031,7 @@ gfc_deallocate_scalar_with_status (tree pointer, tree status, tree label_finish,
> gfc_start_block (&non_null);
>
> /* Free allocatable components. */
> - finalizable = gfc_add_finalizer_call (&non_null, expr);
> + finalizable = gfc_add_finalizer_call (&non_null, expr, class_container);
> if (!finalizable && ts.type == BT_DERIVED && ts.u.derived->attr.alloc_comp)
> {
> int caf_mode = coarray
> diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
> index be9ccbc3d29..109d7647235 100644
> --- a/gcc/fortran/trans.h
> +++ b/gcc/fortran/trans.h
> @@ -771,10 +771,11 @@ void gfc_allocate_using_malloc (stmtblock_t *, tree, tree, tree);
>
> /* Generate code to deallocate an array. */
> tree gfc_deallocate_with_status (tree, tree, tree, tree, tree, bool,
> - gfc_expr *, int, tree a = NULL_TREE,
> - tree c = NULL_TREE);
> + gfc_expr *, int, tree = NULL_TREE,
> + tree a = NULL_TREE, tree c = NULL_TREE);
> tree gfc_deallocate_scalar_with_status (tree, tree, tree, bool, gfc_expr*,
> - gfc_typespec, bool c = false);
> + gfc_typespec, tree = NULL_TREE,
> + bool c = false);
>
> /* Generate code to call realloc(). */
> tree gfc_call_realloc (stmtblock_t *, tree, tree);
> diff --git a/gcc/testsuite/gfortran.dg/intent_out_22.f90 b/gcc/testsuite/gfortran.dg/intent_out_22.f90
> new file mode 100644
> index 00000000000..a38afccf0e5
> --- /dev/null
> +++ b/gcc/testsuite/gfortran.dg/intent_out_22.f90
> @@ -0,0 +1,37 @@
> +! { dg-do run }
> +!
> +! PR fortran/110618
> +! Check that if a data reference is passed as actual argument whose dummy
> +! has INTENT(OUT) attribute, any other argument depending on the
> +! same data reference is evaluated before the data reference deallocation.
> +
> +program p
> + implicit none
> + type t
> + integer :: i
> + end type t
> + type u
> + class(t), allocatable :: ta(:)
> + end type u
> + type(u), allocatable :: c(:)
> + class(t), allocatable :: d(:)
> + allocate(c, source = [u([t(1), t(3)]), u([t(4), t(9)])])
> + allocate(d, source = [t(1), t(5)])
> + call bar ( &
> + allocated(c(d(1)%i)%ta), &
> + d, &
> + c(d(1)%i)%ta, &
> + allocated (c(d(1)%i)%ta) &
> + )
> + if (allocated (c(1)%ta)) stop 11
> + if (.not. allocated (c(2)%ta)) stop 11
> +contains
> + subroutine bar (alloc, x, y, alloc2)
> + logical :: alloc, alloc2
> + class(t), allocatable, intent(out) :: x(:)
> + class(t), allocatable, intent(out) :: y(:)
> + if (allocated (x)) stop 1
> + if (.not. alloc) stop 2
> + if (.not. alloc2) stop 3
> + end subroutine bar
> +end
> --
> 2.40.1
>
--
"If you can't explain it simply, you don't understand it well enough"
- Albert Einstein
next prev parent reply other threads:[~2023-07-14 5:55 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 ` [PATCH 04/14] fortran: Inline gfc_build_final_call Mikael Morin
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 [this message]
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='CAGkQGi+vmg59fG+R_mJfdpANDJau9B2Jng=Cp0=VDVy1QLSExw@mail.gmail.com' \
--to=paul.richard.thomas@gmail.com \
--cc=fortran@gcc.gnu.org \
--cc=mikael@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).