From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 9 Dec 2024 02:20:40 +0000 (-0600)
Subject: tcg/optimize: Use fold_masks_s in fold_nand
X-Git-Tag: v10.0.0-rc0~107^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3168ee93e4a9cabe31824f7918bfe4b7a56369;p=thirdparty%2Fqemu.git

tcg/optimize: Use fold_masks_s in fold_nand

Avoid the use of the OptContext slots.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/tcg/optimize.c b/tcg/optimize.c
index 10d1376f620..7fe5bd6012f 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -2028,14 +2028,16 @@ static bool fold_multiply2(OptContext *ctx, TCGOp *op)
 
 static bool fold_nand(OptContext *ctx, TCGOp *op)
 {
+    uint64_t s_mask;
+
     if (fold_const2_commutative(ctx, op) ||
         fold_xi_to_not(ctx, op, -1)) {
         return true;
     }
 
-    ctx->s_mask = arg_info(op->args[1])->s_mask
-                & arg_info(op->args[2])->s_mask;
-    return false;
+    s_mask = arg_info(op->args[1])->s_mask
+           & arg_info(op->args[2])->s_mask;
+    return fold_masks_s(ctx, op, s_mask);
 }
 
 static bool fold_neg_no_const(OptContext *ctx, TCGOp *op)