https://gcc.gnu.org/g:f74f8f206e2ed870d02a3ce64a54671f04e4af64
commit f74f8f206e2ed870d02a3ce64a54671f04e4af64 Author: Mikael Morin <[email protected]> Date: Sat Jul 19 15:55:36 2025 +0200 Introduction gfc_init_descriptor_result Revert "Suppression gfc_init_descriptor_result" This reverts commit 0f85f1e92970d2a0f13dc61a9781323f33a3b631. Diff: --- gcc/fortran/trans-decl.cc | 4 +--- gcc/fortran/trans-descriptor.cc | 7 +++++++ gcc/fortran/trans-descriptor.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc index 9c323f64f1e6..14c3d1898ca6 100644 --- a/gcc/fortran/trans-decl.cc +++ b/gcc/fortran/trans-decl.cc @@ -4825,14 +4825,12 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) else if (proc_sym == proc_sym->result && IS_CLASS_ARRAY (proc_sym)) { /* Nullify explicit return class arrays on entry. */ - tree type; tmp = get_proc_result (proc_sym); if (tmp && GFC_CLASS_TYPE_P (TREE_TYPE (tmp))) { gfc_start_block (&init); tmp = gfc_class_data_get (tmp); - type = TREE_TYPE (gfc_conv_descriptor_data_get (tmp)); - gfc_conv_descriptor_data_set (&init, tmp, build_int_cst (type, 0)); + gfc_init_descriptor_result (&init, tmp); gfc_add_init_cleanup (block, gfc_finish_block (&init), NULL_TREE); } } diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index cab0c62fde3d..11b96545a07c 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -788,3 +788,10 @@ gfc_nullify_descriptor (stmtblock_t *block, tree descr) { gfc_conv_descriptor_data_set (block, descr, null_pointer_node); } + + +void +gfc_init_descriptor_result (stmtblock_t *block, tree descr) +{ + gfc_conv_descriptor_data_set (block, descr, null_pointer_node); +} diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h index 717b1a28f677..d3fef99db084 100644 --- a/gcc/fortran/trans-descriptor.h +++ b/gcc/fortran/trans-descriptor.h @@ -76,5 +76,6 @@ void gfc_grow_array (stmtblock_t *, tree, tree); /* Build a null array descriptor constructor. */ void gfc_nullify_descriptor (stmtblock_t *block, tree); +void gfc_init_descriptor_result (stmtblock_t *block, tree descr); #endif /* GFC_TRANS_DESCRIPTOR_H */
