[gcc(refs/users/mikael/heads/refactor_descriptor_v07)] Extraction fonction gfc_nullify_descriptor

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:cb9b31c1500564484b634a1ee455d36ff41c1a0c

commit cb9b31c1500564484b634a1ee455d36ff41c1a0c
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 | 6 ++++++
 gcc/fortran/trans-descriptor.h  | 6 ++----
 gcc/fortran/trans-expr.cc       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index e9e2488d45ec..67d15d703cce 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -889,3 +889,9 @@ gfc_conv_shift_descriptor (stmtblock_t *block, tree desc,
   conv_shift_descriptor (block, desc, as);
 }
  
+
+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 eead222bb3c7..584501bfe8de 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -20,10 +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 (const gfc_typespec &, tree);
-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);
 void gfc_set_descriptor_with_shape (stmtblock_t *, tree, tree,
@@ -96,11 +92,13 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, 
tree *data_off,
                                     tree *stride_suboff, tree *lower_suboff,
                                     tree *upper_suboff);
 
+tree gfc_build_default_class_descriptor (const gfc_typespec &, tree);
 void gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, tree descr);
 void gfc_clear_descriptor (tree descr);
 void gfc_set_scalar_descriptor (stmtblock_t *, tree, tree);
 void gfc_conv_shift_descriptor_lbound (stmtblock_t *, tree, int, tree);
 void gfc_conv_shift_descriptor (stmtblock_t *, tree, int);
 void gfc_conv_shift_descriptor (stmtblock_t *, tree, const gfc_array_ref &);
+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 2defb2f3f1da..106f6ee7f4d8 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -11053,7 +11053,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)
        {