[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Renommage set_descriptor_from_scalar{, _class}

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:29f1a460c67771575bae06dd2646598f33cbd0ca

commit 29f1a460c67771575bae06dd2646598f33cbd0ca
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Tue Aug 12 18:29:24 2025 +0200

    Renommage set_descriptor_from_scalar{,_class}

Diff:
---
 gcc/fortran/trans-descriptor.cc | 4 ++--
 gcc/fortran/trans-descriptor.h  | 4 +---
 gcc/fortran/trans-expr.cc       | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 3273c06eaa0e..f01f1a13fd6b 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -1168,8 +1168,8 @@ gfc_create_null_actual_descriptor (stmtblock_t *block, 
gfc_typespec *ts,
 
 
 void
-gfc_set_descriptor_from_scalar (stmtblock_t *block, tree descr,
-                               tree scalar, gfc_expr *scalar_expr)
+gfc_set_descriptor_from_scalar_class (stmtblock_t *block, tree descr,
+                                     tree scalar, gfc_expr *scalar_expr)
 {
   tree type = gfc_get_scalar_to_descriptor_type (TREE_TYPE (scalar),
                                                 gfc_expr_attr (scalar_expr));
diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h
index ec3ae430a8e6..7668e5b45f22 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -25,8 +25,6 @@ void gfc_set_scalar_null_descriptor (stmtblock_t *block, 
tree, gfc_symbol *, gfc
 void gfc_set_descriptor_with_shape (stmtblock_t *, tree, tree,
                                    gfc_expr *, locus *);
 tree gfc_get_scalar_to_descriptor_type (tree scalar, symbol_attribute attr);
-void gfc_set_descriptor_from_scalar (stmtblock_t *, tree, tree,
-                                    symbol_attribute *, tree = NULL_TREE);
 void gfc_copy_sequence_descriptor (stmtblock_t &, tree, tree, bool);
 void gfc_set_gfc_from_cfi (stmtblock_t *, stmtblock_t *, tree, tree, tree,
                           gfc_symbol *, bool, bool, bool);
@@ -108,8 +106,8 @@ void gfc_copy_descriptor (stmtblock_t *, tree, tree, tree, 
int, gfc_ss *);
 void gfc_copy_descriptor (stmtblock_t *, tree, tree, bool);
 void gfc_copy_descriptor (stmtblock_t *, tree, tree, int);
 
+void gfc_set_descriptor_from_scalar_class (stmtblock_t *, tree, tree, gfc_expr 
*);
 void gfc_set_descriptor_from_scalar (stmtblock_t *, tree, tree);
-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, tree);
 
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index c2ca07be3fc7..1e594cfe5820 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -1257,7 +1257,7 @@ gfc_conv_class_to_class (gfc_se *parmse, gfc_expr *e, 
gfc_typespec class_ts,
       && e->rank != class_ts.u.derived->components->as->rank)
     {
       if (e->rank == 0)
-       gfc_set_descriptor_from_scalar (&block, ctree, parmse->expr, e);
+       gfc_set_descriptor_from_scalar_class (&block, ctree, parmse->expr, e);
       else
        gfc_class_array_data_assign (&block, ctree, parmse->expr, false);
     }