From 9ffa5420e927c327412c9e4ef113ad2f1a564aec Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 9 Dec 2024 17:48:02 -0600 Subject: [PATCH] tcg/optimize: Simplify fold_and constant checks If operand 2 is constant, then the computation of z_mask and a_mask will produce the same results as the explicit checks via fold_xi_to_i and fold_xi_to_x. Shift the call of fold_xx_to_x down below the ti_is_const(t2) check. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- tcg/optimize.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 06ccf39d642..f3a2328fe40 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1434,10 +1434,7 @@ static bool fold_and(OptContext *ctx, TCGOp *op) uint64_t z_mask, o_mask, s_mask, a_mask; TempOptInfo *t1, *t2; - if (fold_const2_commutative(ctx, op) || - fold_xi_to_i(ctx, op, 0) || - fold_xi_to_x(ctx, op, -1) || - fold_xx_to_x(ctx, op)) { + if (fold_const2_commutative(ctx, op)) { return true; } @@ -1473,6 +1470,8 @@ static bool fold_and(OptContext *ctx, TCGOp *op) op->args[3] = len; } } + } else { + fold_xx_to_x(ctx, op); } } return true; -- 2.47.2