https://gcc.gnu.org/g:cad894358a86fd4cacbc2a60fdb8cf8ff5e4ff36
commit cad894358a86fd4cacbc2a60fdb8cf8ff5e4ff36 Author: Mikael Morin <mik...@gcc.gnu.org> Date: Fri Jul 11 16:14:33 2025 +0200 Sauvegarde compil' OK Diff: --- gcc/fortran/trans-array.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc index 80765a3b1c63..82d6d47d5d3c 100644 --- a/gcc/fortran/trans-array.cc +++ b/gcc/fortran/trans-array.cc @@ -3439,7 +3439,7 @@ save_descriptor_data (tree descr, tree data) typedef struct { - tree expr, repl; + tree target, repl; } substitute_t; @@ -3448,7 +3448,7 @@ static tree maybe_substitute_expr (tree *tp, int *walk_subtree, void *data) { substitute_t *subst = (substitute_t *) data; - if (*tp == subst->expr) + if (*tp == subst->target) { *tp = subst->repl; *walk_subtree = 0; @@ -3458,16 +3458,16 @@ maybe_substitute_expr (tree *tp, int *walk_subtree, void *data) } -/* Substitute in CONTEXT any occurence of EXPR with REPLACEMENT. */ +/* Substitute in EXPR any occurence of TARGET with REPLACEMENT. */ static void -substitute_in_tree (tree expr, tree replacement, tree context) +substitute_subexpr_in_expr (tree target, tree replacement, tree expr) { substitute_t subst; - subst.expr = t; + subst.target = target; subst.repl = replacement; - walk_tree (&context, maybe_ubstitute_expr, &subst, nullptr); + walk_tree (&expr, maybe_substitute_expr, &subst, nullptr); } @@ -3554,7 +3554,7 @@ set_factored_descriptor_value (stmtblock_t *block, tree *desc_ptr, tree value) unsigned i; tree repl_root; FOR_EACH_VEC_ELT (replacement_roots, i, repl_root) - replace_tree_in_expr (saveable_ref, repl_root, var); + substitute_subexpr_in_expr (saveable_ref, var, repl_root); replacement_roots.safe_push (saveable_ref); saveable_ref = NULL_TREE;