[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Extraction gfc_set_descriptor_from_scalar

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:4d3b1299152f55d577f72f257ae745a573170b1c

commit 4d3b1299152f55d577f72f257ae745a573170b1c
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Tue Jul 22 21:03:11 2025 +0200

    Extraction gfc_set_descriptor_from_scalar

Diff:
---
 gcc/fortran/trans-descriptor.cc | 20 ++++++++++++++++++++
 gcc/fortran/trans-descriptor.h  |  2 ++
 gcc/fortran/trans-expr.cc       | 16 ++--------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index fd31cbe62a2d..44e710e0c11f 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -1820,3 +1820,23 @@ gfc_set_descriptor_from_scalar (stmtblock_t *block, tree 
descr,
   gfc_conv_descriptor_data_set (block, descr, tmp);
 }
 
+
+void
+gfc_set_descriptor_from_scalar (stmtblock_t *block, tree descr,
+                               tree scalar, gfc_expr *scalar_expr,
+                               tree cond_presence)
+{
+  tree type;
+  type = gfc_get_scalar_to_descriptor_type (TREE_TYPE (scalar),
+                                           gfc_expr_attr (scalar_expr));
+  gfc_conv_descriptor_dtype_set (block, descr,
+                                gfc_get_dtype (type));
+  if (cond_presence)
+    scalar = build3_loc (input_location, COND_EXPR,
+                        TREE_TYPE (scalar),
+                        cond_presence, scalar,
+                        fold_convert (TREE_TYPE (scalar),
+                                      null_pointer_node));
+  gfc_conv_descriptor_data_set (block, descr, scalar);
+}
+
diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h
index b8c771c7bd66..a4c77c2fbb69 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -121,6 +121,8 @@ void gfc_set_gfc_from_cfi (stmtblock_t *, tree, gfc_expr *, 
tree, tree,
 void gfc_set_gfc_from_cfi (stmtblock_t *, stmtblock_t *, tree, tree, tree,
                           gfc_symbol *, bool);
 void gfc_set_descriptor_from_scalar (stmtblock_t *, tree, tree, gfc_expr *);
+void gfc_set_descriptor_from_scalar (stmtblock_t *, tree, tree, gfc_expr *,
+                                    tree);
 
 void gfc_init_descriptor_variable (stmtblock_t *block, gfc_symbol *sym, tree 
descr);
 void gfc_init_static_descriptor (tree descr);
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index 9e09e81ad43a..d16d2c9c07f6 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -901,20 +901,8 @@ gfc_conv_derived_to_class (gfc_se *parmse, gfc_expr *e, 
gfc_symbol *fsym,
 
          /* Scalar to an assumed-rank array.  */
          if (fsym->ts.u.derived->components->as)
-           {
-             tree type;
-             type = gfc_get_scalar_to_descriptor_type (TREE_TYPE 
(parmse->expr),
-                                                       gfc_expr_attr (e));
-             gfc_conv_descriptor_dtype_set (&parmse->pre, ctree,
-                                            gfc_get_dtype (type));
-             if (optional)
-               parmse->expr = build3_loc (input_location, COND_EXPR,
-                                          TREE_TYPE (parmse->expr),
-                                          cond_optional, parmse->expr,
-                                          fold_convert (TREE_TYPE 
(parmse->expr),
-                                                        null_pointer_node));
-             gfc_conv_descriptor_data_set (&parmse->pre, ctree, parmse->expr);
-           }
+           gfc_set_descriptor_from_scalar (&parmse->pre, ctree,
+                                           parmse->expr, e, cond_optional);
           else
            {
              tmp = fold_convert (TREE_TYPE (ctree), parmse->expr);