https://gcc.gnu.org/g:0ab985f055eda772e2f3dcd08f96c59346e14ccf
commit 0ab985f055eda772e2f3dcd08f96c59346e14ccf
Author: Mikael Morin <mik...@gcc.gnu.org>
Date: Tue Jul 1 22:21:04 2025 +0200
Revert "Ajout locations setters"
This reverts commit c34e1bd187e3f2ec9bff203154931342af55bf92.
Diff:
---
gcc/fortran/trans-descriptor.cc | 67 +++++++++++++++--------------------------
1 file changed, 24 insertions(+), 43 deletions(-)
diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index b098144ceb0f..4aacf1d0ce6f 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -218,10 +218,10 @@ gfc_conv_descriptor_data_get (tree desc)
tree type = TREE_TYPE (desc);
gcc_assert (TREE_CODE (type) != REFERENCE_TYPE);
- location_t loc = input_location;
tree field = get_descriptor_data (desc);
tree target_type = GFC_TYPE_ARRAY_DATAPTR_TYPE (TREE_TYPE (desc));
- return non_lvalue_loc (loc, fold_convert_loc (loc, target_type, field));
+ tree t = fold_convert (target_type, field);
+ return non_lvalue_loc (input_location, t);
}
/* This provides WRITE access to the data field.
@@ -235,17 +235,16 @@ gfc_conv_descriptor_data_get (tree desc)
void
gfc_conv_descriptor_data_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree field = get_descriptor_data (desc);
- gfc_add_modify_loc (loc, block, field,
- fold_convert_loc (loc, TREE_TYPE (field), value));
+ gfc_add_modify (block, field, fold_convert (TREE_TYPE (field), value));
}
static tree
get_descriptor_offset (tree desc)
{
- return get_descr_comp (desc, OFFSET_FIELD, gfc_array_index_type);
+ tree field = get_descr_comp (desc, OFFSET_FIELD, gfc_array_index_type);
+ return field;
}
tree
@@ -257,17 +256,16 @@ gfc_conv_descriptor_offset_get (tree desc)
void
gfc_conv_descriptor_offset_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_offset (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
static tree
get_descriptor_dtype (tree desc)
{
- return get_descr_comp (desc, DTYPE_FIELD, get_dtype_type_node ());
+ tree comp = get_descr_comp (desc, DTYPE_FIELD, get_dtype_type_node ());
+ return comp;
}
tree
@@ -279,17 +277,16 @@ gfc_conv_descriptor_dtype_get (tree desc)
void
gfc_conv_descriptor_dtype_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_dtype (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
static tree
gfc_conv_descriptor_span (tree desc)
{
- return get_descr_comp (desc, SPAN_FIELD, gfc_array_index_type);
+ tree comp = get_descr_comp (desc, SPAN_FIELD, gfc_array_index_type);
+ return comp;
}
tree
@@ -301,10 +298,8 @@ gfc_conv_descriptor_span_get (tree desc)
void
gfc_conv_descriptor_span_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree t = gfc_conv_descriptor_span (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
@@ -330,10 +325,8 @@ gfc_conv_descriptor_rank_get (tree desc)
void
gfc_conv_descriptor_rank_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_rank (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
void
@@ -355,12 +348,11 @@ gfc_conv_descriptor_version_get (tree desc)
}
void
-gfc_conv_descriptor_version_set (stmtblock_t *block, tree desc, tree value)
+gfc_conv_descriptor_version_set (stmtblock_t *block, tree desc,
+ tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_version (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
@@ -379,12 +371,11 @@ gfc_conv_descriptor_elem_len_get (tree desc)
}
void
-gfc_conv_descriptor_elem_len_set (stmtblock_t *block, tree desc, tree value)
+gfc_conv_descriptor_elem_len_set (stmtblock_t *block, tree desc,
+ tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_elem_len (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
@@ -403,10 +394,8 @@ gfc_conv_descriptor_type_get (tree desc)
void
gfc_conv_descriptor_type_set (stmtblock_t *block, tree desc, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_type (desc);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
void
@@ -479,10 +468,8 @@ void
gfc_conv_descriptor_dimension_set (stmtblock_t *block, tree desc, tree dim,
tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_dimension (desc, dim);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
void
@@ -539,10 +526,8 @@ void
gfc_conv_descriptor_stride_set (stmtblock_t *block, tree desc,
tree dim, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_stride (desc, dim);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
static tree
@@ -561,10 +546,8 @@ void
gfc_conv_descriptor_lbound_set (stmtblock_t *block, tree desc,
tree dim, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_lbound (desc, dim);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
static tree
@@ -583,10 +566,8 @@ void
gfc_conv_descriptor_ubound_set (stmtblock_t *block, tree desc,
tree dim, tree value)
{
- location_t loc = input_location;
tree t = get_descriptor_ubound (desc, dim);
- gfc_add_modify_loc (loc, block, t,
- fold_convert_loc (loc, TREE_TYPE (t), value));
+ gfc_add_modify (block, t, fold_convert (TREE_TYPE (t), value));
}
