https://gcc.gnu.org/g:dca0c34ddb086616d2aec5744773e359819296e7
commit dca0c34ddb086616d2aec5744773e359819296e7 Author: Mikael Morin <[email protected]> Date: Mon Nov 16 17:45:13 2026 +0100 fortran: array descriptor: Factor scalar descriptor init 2/2 [PR122521] Fortran-tested on aarch64-unknown-linux-gnu. -- >8 -- The static function set_descriptor_from_scalar is already used as implementation detail by two of the three scalar descriptor initialization functions. Use it as well in the third one. PR fortran/122521 gcc/fortran/ChangeLog: * trans-descriptor.cc (gfc_set_descriptor_from_scalar): Replace inline code with call to set_descriptor_from_scalar. Diff: --- gcc/fortran/trans-descriptor.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc index 7b24a05c809b..19235bd249e2 100644 --- a/gcc/fortran/trans-descriptor.cc +++ b/gcc/fortran/trans-descriptor.cc @@ -908,11 +908,7 @@ gfc_set_descriptor_from_scalar (stmtblock_t *block, tree descr, tree scalar) tree etype = TREE_TYPE (scalar); if (!POINTER_TYPE_P (TREE_TYPE (scalar))) scalar = gfc_build_addr_expr (NULL_TREE, scalar); - - gfc_conv_descriptor_dtype_set (block, descr, - gfc_get_dtype_rank_type (0, etype)); - gfc_copy_coarray_desc_part (block, descr, scalar); - gfc_conv_descriptor_data_set (block, descr, scalar); + set_descriptor_from_scalar (block, descr, etype, scalar, NULL_TREE); gfc_conv_descriptor_span_set (block, descr, gfc_conv_descriptor_elem_len_get (descr)); }
