On 12/10/24 07:23, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> tcg/optimize.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index ae1386c681..3d852b44e4 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -2061,17 +2061,19 @@ static bool fold_not(OptContext *ctx, TCGOp *op)
>
> static bool fold_or(OptContext *ctx, TCGOp *op)
> {
> + uint64_t z_mask, s_mask;
> +
> if (fold_const2_commutative(ctx, op) ||
> fold_xi_to_x(ctx, op, 0) ||
> fold_xx_to_x(ctx, op)) {
> return true;
> }
>
> - ctx->z_mask = arg_info(op->args[1])->z_mask
> - | arg_info(op->args[2])->z_mask;
> - ctx->s_mask = arg_info(op->args[1])->s_mask
> - & arg_info(op->args[2])->s_mask;
> - return fold_masks(ctx, op);
> + z_mask = arg_info(op->args[1])->z_mask
> + | arg_info(op->args[2])->z_mask;
> + s_mask = arg_info(op->args[1])->s_mask
> + & arg_info(op->args[2])->s_mask;
> + return fold_masks_zs(ctx, op, z_mask, s_mask);
> }
>
> static bool fold_orc(OptContext *ctx, TCGOp *op)
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>