[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Utilisation gfc_clear_descriptor

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:3bc086eceb4c50c611b2138564690f18b36ad851

commit 3bc086eceb4c50c611b2138564690f18b36ad851
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Tue Jul 15 21:49:27 2025 +0200

    Utilisation gfc_clear_descriptor
    
    Correction gfc_clear_descriptor assumed rank

Diff:
---
 gcc/fortran/trans-descriptor.cc | 20 ++++++++++++++++----
 gcc/fortran/trans-descriptor.h  |  4 +---
 gcc/fortran/trans-expr.cc       |  5 ++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index c93ced8bc6b8..bda567cf91f2 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -670,9 +670,8 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, 
tree *data_off,
 #undef LBOUND_SUBFIELD
 #undef UBOUND_SUBFIELD
 
-
 void
-gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, tree descr)
+gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, gfc_expr *expr, 
tree descr)
 {
   symbol_attribute attr = gfc_symbol_attr (sym);
 
@@ -694,12 +693,25 @@ gfc_clear_descriptor (stmtblock_t *block, gfc_symbol 
*sym, tree descr)
   else
     as = sym->as;
 
-  gcc_assert (as && as->rank >= 0);
+  int rank;
+  if (as == nullptr)
+    rank = 0;
+  else if (as->type == AS_ASSUMED_RANK)
+    rank = expr->rank;
+  else
+    rank = as->rank;
+
+  gcc_assert (rank >= 0);
   etype = gfc_get_element_type (TREE_TYPE (descr));
   gfc_conv_descriptor_dtype_set (block, descr,
-                                gfc_get_dtype_rank_type (as->rank, etype));
+                                gfc_get_dtype_rank_type (rank, etype));
 }
 
+void
+gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, tree descr)
+{
+  return gfc_clear_descriptor (block, sym, nullptr, descr);
+}
 
 void
 gfc_clear_descriptor (tree descr)
diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h
index e649037c788d..8c763ee654d0 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -20,11 +20,8 @@ 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,
                                    gfc_expr *, locus *);
@@ -97,6 +94,7 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, 
tree *data_off,
                                     tree *upper_suboff);
 
 void gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, tree descr);
+void gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *, gfc_expr *, tree);
 void gfc_clear_descriptor (tree descr);
 
 #endif /* GFC_TRANS_DESCRIPTOR_H */
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index 39e953fa2af3..45a42c5aae52 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -978,10 +978,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_clear_descriptor (&block, fsym, ctree);
              if (derived_array && *derived_array != NULL_TREE)
-               gfc_conv_descriptor_data_set (&block, *derived_array,
-                                             null_pointer_node);
+               gfc_clear_descriptor (&block, fsym, *derived_array);
 
              tmp = build3_v (COND_EXPR, cond_optional, tmp,
                              gfc_finish_block (&block));