From df8e1fdc2cd3458d025866900bb232fe7afe5ac6 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 19 May 2008 21:42:48 +0000 Subject: [PATCH] tree.c (substitute_in_expr): Fix thinko. * tree.c (substitute_in_expr) : Fix thinko. From-SVN: r135582 --- gcc/ChangeLog | 4 ++++ gcc/tree.c | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ed8a8ad718..e9edd794f4d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2008-05-19 Eric Botcazou + + * tree.c (substitute_in_expr) : Fix thinko. + 2008-05-19 H.J. Lu * gcc/config/i386/i386.c (ix86_expand_vector_init_concat): Change diff --git a/gcc/tree.c b/gcc/tree.c index 5a0656c67ac..18a9460d063 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -2516,8 +2516,7 @@ substitute_in_expr (tree exp, tree f, tree r) { enum tree_code code = TREE_CODE (exp); tree op0, op1, op2, op3; - tree new; - tree inner; + tree new, inner; /* We handle TREE_LIST and COMPONENT_REF separately. */ if (code == TREE_LIST) @@ -2627,13 +2626,15 @@ substitute_in_expr (tree exp, tree f, tree r) for (i = 1; i < TREE_OPERAND_LENGTH (exp); i++) { tree op = TREE_OPERAND (exp, i); - tree newop = SUBSTITUTE_IN_EXPR (op, f, r); - if (newop != op) + tree new_op = SUBSTITUTE_IN_EXPR (op, f, r); + if (new_op != op) { - copy = copy_node (exp); - TREE_OPERAND (copy, i) = newop; + if (!copy) + copy = copy_node (exp); + TREE_OPERAND (copy, i) = new_op; } } + if (copy) new = fold (copy); else -- 2.30.2