The following reverts a part of the PR103037 fix which is no longer necessary after the fix for PR104700. That makes the possible cummulative backport smaller.
Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2022-02-28 Richard Biener <rguent...@suse.de> * tree-ssa-pre.cc (compute_avail): Revert part of last change. --- gcc/tree-ssa-pre.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gcc/tree-ssa-pre.cc b/gcc/tree-ssa-pre.cc index ca034ff7153..47d70c85c3c 100644 --- a/gcc/tree-ssa-pre.cc +++ b/gcc/tree-ssa-pre.cc @@ -3993,14 +3993,7 @@ compute_avail (function *fun) FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF) { pre_expr e = get_or_alloc_expr_for_name (op); - unsigned value_id = get_expr_value_id (e); - if (value_id_constant_p (value_id)) - { - get_or_alloc_expr_for_constant (VN_INFO (op)->valnum); - continue; - } - - add_to_value (value_id, e); + add_to_value (get_expr_value_id (e), e); bitmap_insert_into_set (TMP_GEN (block), e); bitmap_value_insert_into_set (AVAIL_OUT (block), e); } -- 2.34.1