From 3a324b98c577fd46d4eb56ffa61bbf67e6951a59 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 1 May 2017 10:18:18 +0000 Subject: [PATCH] tree.c (substitute_in_expr): Also inline a call if the replacement expression is another instance of one of... * tree.c (substitute_in_expr) : Also inline a call if the replacement expression is another instance of one of its arguments. From-SVN: r247431 --- gcc/ChangeLog | 5 +++++ gcc/tree.c | 24 +++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 52c6a4eb4fa..07b205c81bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-05-01 Eric Botcazou + + * tree.c (substitute_in_expr) : Also inline a call if the + replacement expression is another instance of one of its arguments. + 2017-05-01 Jakub Jelinek PR target/79430 diff --git a/gcc/tree.c b/gcc/tree.c index bef0071d087..1a926d9a650 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -3886,15 +3886,29 @@ substitute_in_expr (tree exp, tree f, tree r) new_tree = NULL_TREE; - /* If we are trying to replace F with a constant, inline back + /* If we are trying to replace F with a constant or with another + instance of one of the arguments of the call, inline back functions which do nothing else than computing a value from the arguments they are passed. This makes it possible to fold partially or entirely the replacement expression. */ - if (CONSTANT_CLASS_P (r) && code == CALL_EXPR) + if (code == CALL_EXPR) { - tree t = maybe_inline_call_in_expr (exp); - if (t) - return SUBSTITUTE_IN_EXPR (t, f, r); + bool maybe_inline = false; + if (CONSTANT_CLASS_P (r)) + maybe_inline = true; + else + for (i = 3; i < TREE_OPERAND_LENGTH (exp); i++) + if (operand_equal_p (TREE_OPERAND (exp, i), r, 0)) + { + maybe_inline = true; + break; + } + if (maybe_inline) + { + tree t = maybe_inline_call_in_expr (exp); + if (t) + return SUBSTITUTE_IN_EXPR (t, f, r); + } } for (i = 1; i < TREE_OPERAND_LENGTH (exp); i++) -- 2.30.2