[gcc(refs/users/mikael/heads/refactor_descriptor_v05)] Correction rebase

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:b513b45a988bb13683721b2f8ccfdb92a6a154fe

commit b513b45a988bb13683721b2f8ccfdb92a6a154fe
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Fri Jun 13 16:47:14 2025 +0200

    Correction rebase

Diff:
---
 gcc/fortran/trans-descriptor.cc | 15 ++++-----------
 gcc/fortran/trans-descriptor.h  |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 67388f88ef3b..03da9eb51263 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -521,13 +521,6 @@ conv_dimension_get (tree desc, tree dim)
 }
 
 
-tree
-get_token_field (tree desc)
-{
-  gcc_assert (flag_coarray == GFC_FCOARRAY_LIB);
-  return get_field (desc, CAF_TOKEN_FIELD);
-}
-
 tree
 get_token (tree desc)
 {
@@ -833,15 +826,15 @@ gfc_conv_descriptor_type_set (stmtblock_t *block, tree 
desc, int value)
 }
 
 tree
-gfc_conv_descriptor_token_get (tree desc)
+gfc_conv_descriptor_token (tree desc)
 {
-  return gfc_descriptor::conv_token_get (desc);
+  return gfc_descriptor::get_token (desc);
 }
 
 tree
-gfc_conv_descriptor_token_field (tree desc)
+gfc_conv_descriptor_token_get (tree desc)
 {
-  return gfc_descriptor::get_token_field (desc);
+  return gfc_descriptor::conv_token_get (desc);
 }
 
 void
diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h
index 33d819f1dafb..f353672f6e27 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -55,8 +55,8 @@ tree gfc_conv_descriptor_lbound_get (tree, tree);
 tree gfc_conv_descriptor_ubound_get (tree, tree);
 tree gfc_conv_descriptor_extent_get (tree, tree);
 tree gfc_conv_descriptor_spacing_get (tree, tree);
+tree gfc_conv_descriptor_token (tree);
 tree gfc_conv_descriptor_token_get (tree);
-tree gfc_conv_descriptor_token_field (tree);
 
 void gfc_conv_descriptor_data_set (stmtblock_t *, tree, tree);
 void gfc_conv_descriptor_token_set (stmtblock_t *, tree, tree);