1 files changed, 2 insertions, 3 deletions

diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c
index 69ade882..312c9cf0 100644
--- a/src/lj_opt_fold.c
+++ b/src/lj_opt_fold.c
@@ -811,17 +811,16 @@ LJFOLD(BROL any BAND)
 LJFOLD(BROR any BAND)
 LJFOLDF(simplify_shift_andk)
 {
-#if LJ_TARGET_MASKEDSHIFT
   IRIns *irk = IR(fright->op2);
   PHIBARRIER(fright);
-  if (irk->o == IR_KINT) {  /* i o (j & 31) ==> i o j */
+  if ((fins->o < IR_BROL ? LJ_TARGET_MASKSHIFT : LJ_TARGET_MASKROT) &&
+      irk->o == IR_KINT) {  /* i o (j & 31) ==> i o j */
     int32_t k = irk->i & 31;
     if (k == 31) {
       fins->op2 = fright->op1;
       return RETRYFOLD;
     }
   }
-#endif
   return NEXTFOLD;
 }