aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lj_opt_fold.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c
index be50bf97..664550f1 100644
--- a/src/lj_opt_fold.c
+++ b/src/lj_opt_fold.c
@@ -2179,14 +2179,16 @@ TRef LJ_FASTCALL lj_opt_fold(jit_State *J)
2179 if (!(J->flags & JIT_F_OPT_FOLD) && irm_kind(lj_ir_mode[fins->o]) == IRM_N) 2179 if (!(J->flags & JIT_F_OPT_FOLD) && irm_kind(lj_ir_mode[fins->o]) == IRM_N)
2180 return lj_opt_cse(J); 2180 return lj_opt_cse(J);
2181 2181
2182 /* Forwarding or CSE disabled? Emit raw IR for loads, except for SLOAD. */ 2182 /* No FOLD, forwarding or CSE? Emit raw IR for loads, except for SLOAD. */
2183 if ((J->flags & (JIT_F_OPT_FWD|JIT_F_OPT_CSE)) != 2183 if ((J->flags & (JIT_F_OPT_FOLD|JIT_F_OPT_FWD|JIT_F_OPT_CSE)) !=
2184 (JIT_F_OPT_FWD|JIT_F_OPT_CSE) && 2184 (JIT_F_OPT_FOLD|JIT_F_OPT_FWD|JIT_F_OPT_CSE) &&
2185 irm_kind(lj_ir_mode[fins->o]) == IRM_L && fins->o != IR_SLOAD) 2185 irm_kind(lj_ir_mode[fins->o]) == IRM_L && fins->o != IR_SLOAD)
2186 return lj_ir_emit(J); 2186 return lj_ir_emit(J);
2187 2187
2188 /* DSE disabled? Emit raw IR for stores. */ 2188 /* No FOLD or DSE? Emit raw IR for stores. */
2189 if (!(J->flags & JIT_F_OPT_DSE) && irm_kind(lj_ir_mode[fins->o]) == IRM_S) 2189 if ((J->flags & (JIT_F_OPT_FOLD|JIT_F_OPT_DSE)) !=
2190 (JIT_F_OPT_FOLD|JIT_F_OPT_DSE) &&
2191 irm_kind(lj_ir_mode[fins->o]) == IRM_S)
2190 return lj_ir_emit(J); 2192 return lj_ir_emit(J);
2191 } 2193 }
2192 2194