https://gcc.gnu.org/g:a18cb8886bdc7167828efab4ea4196f3d9140deb
commit a18cb8886bdc7167828efab4ea4196f3d9140deb Author: Mikael Morin <mik...@gcc.gnu.org> Date: Wed Aug 6 21:28:50 2025 +0200 Extraction gfc_init_absent_descriptor Diff: --- gcc/fortran/trans-descriptor.cc | 7 +++++++ gcc/fortran/trans-descriptor.h | 4 +--- gcc/fortran/trans-expr.cc | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index e714a5a878e4..1a15d225fb17 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -700,3 +700,10 @@ gfc_init_descriptor_result (stmtblock_t *block, tree descr) { gfc_conv_descriptor_data_set (block, descr, null_pointer_node); } + + +void +gfc_init_absent_descriptor (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 e0935fc74d76..a75212fba3cf 100644 --- a/gcc/fortran/trans-descriptor.h +++ b/gcc/fortran/trans-descriptor.h @@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see #define GFC_TRANS_DESCRIPTOR_H /* Build a null array descriptor constructor. */ -tree gfc_build_null_descriptor (tree); -tree gfc_build_default_class_descriptor (tree, gfc_typespec &); -void gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *, tree); void gfc_nullify_descriptor (stmtblock_t *block, gfc_expr *, tree); void gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *, gfc_expr *, tree); void gfc_set_scalar_null_descriptor (stmtblock_t *block, tree, gfc_symbol *, gfc_expr *, tree); @@ -99,5 +96,6 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, tree *data_off, /* Build a null array descriptor constructor. */ void gfc_nullify_descriptor (stmtblock_t *block, tree); void gfc_init_descriptor_result (stmtblock_t *block, tree descr); +void gfc_init_absent_descriptor (stmtblock_t *block, tree descr); #endif /* GFC_TRANS_DESCRIPTOR_H */ diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index 39cdaa3115bb..0ec661de4e31 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -991,10 +991,9 @@ gfc_conv_derived_to_class (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym, tmp = gfc_finish_block (&block); gfc_init_block (&block); - gfc_conv_descriptor_data_set (&block, ctree, null_pointer_node); + gfc_init_absent_descriptor (&block, ctree); if (derived_array && *derived_array != NULL_TREE) - gfc_conv_descriptor_data_set (&block, *derived_array, - null_pointer_node); + gfc_init_absent_descriptor (&block, *derived_array); tmp = build3_v (COND_EXPR, cond_optional, tmp, gfc_finish_block (&block));