https://gcc.gnu.org/g:4611d9fbdb44dea75dbf5e22280546d4cebb1bb1
commit 4611d9fbdb44dea75dbf5e22280546d4cebb1bb1 Author: Mikael Morin <[email protected]> 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 | 1 + gcc/fortran/trans-expr.cc | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index cf38ed69bb2b..a2b5ffe01d4a 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -890,3 +890,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 623698382559..2d46b5b35c81 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); +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 a304770e791d..c78887cfbf92 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -1069,10 +1069,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));
