https://gcc.gnu.org/g:9dc2fa7b1244e48fb72eb1f5105cd4bf7101158c
commit 9dc2fa7b1244e48fb72eb1f5105cd4bf7101158c Author: Mikael Morin <mik...@gcc.gnu.org> Date: Wed Jul 16 16:49:28 2025 +0200 Extraction fonction gfc_nullify_descriptor Diff: --- gcc/fortran/trans-descriptor.cc | 7 +++++++ gcc/fortran/trans-descriptor.h | 4 ++++ gcc/fortran/trans-expr.cc | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index 7e367fdbe999..758247f1f1fb 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -717,3 +717,10 @@ gfc_nullify_descriptor (stmtblock_t *block, gfc_expr *expr, tree descr, gfc_conv_descriptor_elem_len_get (descr)); } + +void +gfc_nullify_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 724f3cc711af..6fcf31fcdf58 100644 --- a/gcc/fortran/trans-descriptor.h +++ b/gcc/fortran/trans-descriptor.h @@ -90,10 +90,14 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, tree *data_off, void gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree descr); void gfc_init_descriptor_result (stmtblock_t *block, tree descr); +tree gfc_build_default_class_descriptor (const gfc_typespec &, tree); void gfc_nullify_descriptor (stmtblock_t *block, gfc_symbol *, gfc_expr *, tree, tree); +void gfc_nullify_descriptor (stmtblock_t *block, gfc_expr *, tree); void gfc_init_static_descriptor (tree descr); void gfc_init_absent_descriptor (stmtblock_t *block, tree descr); void gfc_set_scalar_descriptor (stmtblock_t *, tree, tree); void gfc_nullify_descriptor (stmtblock_t *, gfc_expr *, tree, tree); +/* Build a null array descriptor constructor. */ +void gfc_nullify_descriptor (stmtblock_t *block, tree); #endif /* GFC_TRANS_DESCRIPTOR_H */ diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index a5f22233db5a..42b6abf7868b 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -11104,7 +11104,7 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, gfc_expr * expr2) if (expr2->expr_type == EXPR_NULL) { /* Just set the data pointer to null. */ - gfc_conv_descriptor_data_set (&lse.pre, lse.expr, null_pointer_node); + gfc_nullify_descriptor (&lse.pre, lse.expr); } else if (rank_remap) {