https://gcc.gnu.org/g:cd43a5e43fb30aec3e7811634ca4c2c76d9601fe
commit cd43a5e43fb30aec3e7811634ca4c2c76d9601fe
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 +-
gcc/fortran/trans-intrinsic.cc | 5 ++---
gcc/fortran/trans-openmp.cc | 6 +++---
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index acbdceac77db..63518b362ac3 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -528,13 +528,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)
{
@@ -846,15 +839,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 7285157466b9..128ea68e4979 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);
diff --git a/gcc/fortran/trans-intrinsic.cc b/gcc/fortran/trans-intrinsic.cc
index 4a7a3cd77a1a..b92a536bea0a 100644
--- a/gcc/fortran/trans-intrinsic.cc
+++ b/gcc/fortran/trans-intrinsic.cc
@@ -1826,7 +1826,7 @@ trans_this_image (gfc_se * se, gfc_expr *expr)
{
stmtblock_t loop;
tree type, desc, dim_arg, cond, tmp, m, loop_var, exit_label, min_var,
- lbound, ubound, extent, ml, team;
+ lbound, extent, ml, team;
gfc_se argse;
int rank, corank;
@@ -13071,8 +13071,7 @@ conv_intrinsic_move_alloc (gfc_code *code)
{
/* Copy the array descriptor data has overwritten the to-token and
cleared
from.data. Now also clear the from.token. */
- gfc_add_modify (&block, gfc_conv_descriptor_token (from_se.expr),
- null_pointer_node);
+ gfc_conv_descriptor_token_set (&block, from_se.expr, null_pointer_node);
}
if (to_expr->ts.type == BT_CHARACTER && to_expr->ts.deferred)
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index 47353a9a2706..273d45cc22fc 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -2029,7 +2029,7 @@ gfc_omp_get_array_size (location_t loc, tree desc,
gimple_seq *seq)
tree end;
if (GFC_TYPE_ARRAY_AKIND (TREE_TYPE (desc)) == GFC_ARRAY_ASSUMED_SHAPE_CONT
|| GFC_TYPE_ARRAY_AKIND (TREE_TYPE (desc)) == GFC_ARRAY_ASSUMED_SHAPE)
- end = gfc_conv_descriptor_rank (desc);
+ end = gfc_conv_descriptor_rank_get (desc);
else
end = build_int_cst (signed_char_type_node,
GFC_TYPE_ARRAY_RANK (TREE_TYPE (desc)));
@@ -2193,7 +2193,7 @@ gfc_omp_deep_mapping_item (bool is_cnt, bool do_copy,
bool do_alloc_check,
/* TODO: Optimization: Shouldn't this be an expr. const, except for
deferred-length strings. (Cf. also below). */
elem_len = (poly ? gfc_class_vtab_size_get (class_decl)
- : gfc_conv_descriptor_elem_len (decl));
+ : gfc_conv_descriptor_elem_len_get (decl));
tmp = (POINTER_TYPE_P (TREE_TYPE (decl))
? build_fold_indirect_ref (decl) : decl);
size = gfc_omp_get_array_size (loc, tmp, seq);
@@ -2238,7 +2238,7 @@ gfc_omp_deep_mapping_item (bool is_cnt, bool do_copy,
bool do_alloc_check,
{
if (elem_len == NULL_TREE)
{
- elem_len = gfc_conv_descriptor_elem_len (decl);
+ elem_len = gfc_conv_descriptor_elem_len_get (decl);
size = fold_convert (size_type_node,
gfc_omp_get_array_size (loc, decl, seq));
}
