[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Refactoring getters & setters

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:2166d7c7a89a1b5de2e9680bb9e2c113ca4dc10c

commit 2166d7c7a89a1b5de2e9680bb9e2c113ca4dc10c
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Tue Jul 1 22:10:35 2025 +0200

    Refactoring getters & setters
    
    Nettoyage refactoring
    
    Correction refactoring

Diff:
---
 gcc/fortran/trans-descriptor.cc | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 5ebd3a10a868..c1b4f3b5e019 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -184,7 +184,6 @@ get_type_field (tree type, unsigned field_idx, tree 
field_type = NULL_TREE)
   return field;
 }
 
-
 static tree
 get_ref_comp (tree ref, unsigned field_idx, tree type = NULL_TREE)
 {
@@ -195,8 +194,7 @@ get_ref_comp (tree ref, unsigned field_idx, tree type = 
NULL_TREE)
 
 
 static tree
-gfc_get_descriptor_field (tree desc, unsigned field_idx,
-                         tree type = NULL_TREE)
+get_descr_comp (tree desc, unsigned field_idx, tree type = NULL_TREE)
 {
   gcc_assert (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (desc)));
 
@@ -207,7 +205,7 @@ gfc_get_descriptor_field (tree desc, unsigned field_idx,
 static tree
 get_descriptor_data (tree desc)
 {
-  return gfc_get_descriptor_field (desc, DATA_FIELD);
+  return get_descr_comp (desc, DATA_FIELD);
 }
 
 /* This provides READ-ONLY access to the data field.  The field itself
@@ -236,7 +234,7 @@ gfc_conv_descriptor_data_get (tree desc)
 void
 gfc_conv_descriptor_data_set (stmtblock_t *block, tree desc, tree value)
 {
-  tree field = gfc_get_descriptor_field (desc, DATA_FIELD);
+  tree field = get_descriptor_data (desc);
   gfc_add_modify (block, field, fold_convert (TREE_TYPE (field), value));
 }
 
@@ -244,7 +242,7 @@ gfc_conv_descriptor_data_set (stmtblock_t *block, tree 
desc, tree value)
 static tree
 get_descriptor_offset (tree desc)
 {
-  return gfc_get_descriptor_field (desc, OFFSET_FIELD, gfc_array_index_type);
+  return get_descr_comp (desc, OFFSET_FIELD, gfc_array_index_type);
 }
 
 tree
@@ -264,7 +262,7 @@ gfc_conv_descriptor_offset_set (stmtblock_t *block, tree 
desc, tree value)
 static tree
 get_descriptor_dtype (tree desc)
 {
-  return gfc_get_descriptor_field (desc, DTYPE_FIELD, get_dtype_type_node ());
+  return get_descr_comp (desc, DTYPE_FIELD, get_dtype_type_node ());
 }
 
 tree
@@ -286,7 +284,7 @@ gfc_conv_descriptor_dtype_set (stmtblock_t *block, tree 
desc, tree value)
 static tree
 gfc_conv_descriptor_span (tree desc)
 {
-  return gfc_get_descriptor_field (desc, SPAN_FIELD, gfc_array_index_type);
+  return get_descr_comp (desc, SPAN_FIELD, gfc_array_index_type);
 }
 
 tree
@@ -443,7 +441,7 @@ gfc_conv_descriptor_type_set (tree desc, int value)
 tree
 gfc_get_descriptor_dimension (tree desc)
 {
-  tree field = gfc_get_descriptor_field (desc, DIMENSION_FIELD);
+  tree field = get_descr_comp (desc, DIMENSION_FIELD);
   gcc_assert (TREE_CODE (TREE_TYPE (field)) == ARRAY_TYPE
              && TREE_CODE (TREE_TYPE (TREE_TYPE (field))) == RECORD_TYPE);
   return field;
@@ -494,7 +492,7 @@ tree
 gfc_conv_descriptor_token (tree desc)
 {
   gcc_assert (flag_coarray == GFC_FCOARRAY_LIB);
-  tree field = gfc_get_descriptor_field (desc, CAF_TOKEN_FIELD);
+  tree field = get_descr_comp (desc, CAF_TOKEN_FIELD);
   /* Should be a restricted pointer - except in the finalization wrapper.  */
   gcc_assert (TREE_TYPE (field) == prvoid_type_node
              || TREE_TYPE (field) == pvoid_type_node);