https://gcc.gnu.org/g:57060d1a37535b40b1f3b42199a085c3883f1cfa
commit 57060d1a37535b40b1f3b42199a085c3883f1cfa Author: Mikael Morin <mik...@gcc.gnu.org> 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 | 8 ++++++++ gcc/fortran/trans-descriptor.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc index 2996dd72e6aa..fd9268793508 100644 --- a/gcc/fortran/trans-decl.cc +++ b/gcc/fortran/trans-decl.cc @@ -4773,14 +4773,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 cc25347551a6..27c85d4e73c1 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -698,3 +698,11 @@ gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree descr) gfc_conv_descriptor_dtype_set (block, descr, gfc_get_dtype_rank_type (as->rank, etype)); } + + +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 6058f54fc5fd..0b6540116452 100644 --- a/gcc/fortran/trans-descriptor.h +++ b/gcc/fortran/trans-descriptor.h @@ -93,5 +93,6 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, tree *data_off, tree *upper_suboff); void gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree descr); +void gfc_init_descriptor_result (stmtblock_t *block, tree descr); #endif /* GFC_TRANS_DESCRIPTOR_H */