https://gcc.gnu.org/g:561701215c93d36660a2fb01f89529e48933000a
commit 561701215c93d36660a2fb01f89529e48933000a Author: Mikael Morin <mik...@gcc.gnu.org> Date: Mon Mar 17 12:15:20 2025 +0100 Renommage fonction gfc_set_scalar_descriptor Diff: --- gcc/fortran/trans-descriptor.cc | 4 ++-- gcc/fortran/trans-descriptor.h | 2 +- gcc/fortran/trans-expr.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index 5e70d803366c..d41e2f079306 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -1879,8 +1879,8 @@ gfc_clear_descriptor (stmtblock_t *block, gfc_symbol *sym, void -gfc_set_scalar_descriptor (stmtblock_t *block, tree descriptor, - gfc_symbol *sym, gfc_expr *expr, tree value) +gfc_set_scalar_null_descriptor (stmtblock_t *block, tree descriptor, + gfc_symbol *sym, gfc_expr *expr, tree value) { symbol_attribute attr; diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h index 8a03d4a43b00..8b404928ab2f 100644 --- a/gcc/fortran/trans-descriptor.h +++ b/gcc/fortran/trans-descriptor.h @@ -24,7 +24,7 @@ tree gfc_build_default_class_descriptor (tree, gfc_typespec &); 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_descriptor (stmtblock_t *block, tree, 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 *); tree gfc_get_scalar_to_descriptor_type (tree scalar, symbol_attribute attr); diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index e25c4d34b7e0..741f9f759a4b 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -103,7 +103,7 @@ gfc_conv_scalar_null_to_descriptor (gfc_se *se, gfc_symbol *sym, gfc_expr *expr, if (!POINTER_TYPE_P (TREE_TYPE (scalar))) scalar = gfc_build_addr_expr (NULL_TREE, scalar); - gfc_set_scalar_descriptor (&se->pre, desc, sym, expr, scalar); + gfc_set_scalar_null_descriptor (&se->pre, desc, sym, expr, scalar); /* Copy pointer address back - but only if it could have changed and if the actual argument is a pointer and not, e.g., NULL(). */