commit 54e26b292bbf9602f49a66c0c022a623d0beec4b
author Richard Henderson <richard.henderson@linaro.org> Sun Dec 08 20:30:20 2024 -0600
committer Richard Henderson <richard.henderson@linaro.org> Tue Dec 24 08:32:15 2024 -0800
tree e4f0dc0ad3d67b207dcd99bafcd7285f5ad4d3e0
parent 83b1ba3696a4c647d500705cdd11e79b69462cd9

tcg/optimize: Use fold_masks_zs in fold_orc

Avoid the use of the OptContext slots.

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

tcg/optimize.c

diff --git a/tcg/optimize.c b/tcg/optimize.c
index e284d79..81ed26a 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -2096,6 +2096,8 @@
 
 static bool fold_orc(OptContext *ctx, TCGOp *op)
 {
+    uint64_t s_mask;
+
     if (fold_const2(ctx, op) ||
         fold_xx_to_i(ctx, op, -1) ||
         fold_xi_to_x(ctx, op, -1) ||
@@ -2103,9 +2105,9 @@
         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_qemu_ld(OptContext *ctx, TCGOp *op)