[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Refactor gfc_init_descriptor_variable

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:0b21f37e6fb3c0622b44e52bb3c888336865beb9

commit 0b21f37e6fb3c0622b44e52bb3c888336865beb9
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Wed Aug 6 21:29:10 2025 +0200

    Refactor gfc_init_descriptor_variable

Diff:
---
 gcc/fortran/trans-descriptor.cc | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 57128bcd953f..44b0d735f004 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -639,7 +639,6 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, 
tree *data_off,
 #undef LBOUND_SUBFIELD
 #undef UBOUND_SUBFIELD
 
-
 void
 gfc_init_descriptor_result (stmtblock_t *block, tree descr)
 {
@@ -662,13 +661,14 @@ gfc_nullify_descriptor (stmtblock_t *block, tree descr)
 
 
 void
-gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree descr)
+gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, gfc_expr 
*expr, tree descr)
 {
   symbol_attribute attr = gfc_symbol_attr (sym);
 
   /* NULLIFY the data pointer for non-saved allocatables, or for non-saved
      pointers when -fcheck=pointer is specified.  */
   if (attr.allocatable
+      || attr.optional
       || (attr.pointer && (gfc_option.rtcheck & GFC_RTCHECK_POINTER)))
     {
       gfc_conv_descriptor_data_set (block, descr, null_pointer_node);
@@ -684,10 +684,26 @@ gfc_init_descriptor_variable (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 = as->rank;
+  else if (expr)
+    rank = expr->rank;
+  else
+    rank = -1;
+
   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_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree descr)
+{
+  return gfc_init_descriptor_variable (block, sym, nullptr, descr);
 }