On 12/10/24 07:23, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> tcg/optimize.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index 3d852b44e4..76ad02d73b 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -2078,6 +2078,8 @@ static bool fold_or(OptContext *ctx, TCGOp *op)
>
> 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) ||
> @@ -2085,9 +2087,9 @@ static bool fold_orc(OptContext *ctx, TCGOp *op)
> 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_zs(ctx, op, -1, s_mask);
> }
>
> static bool fold_qemu_ld(OptContext *ctx, TCGOp *op)
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>