gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2013-04-26 00:59:35 +02:00
commit bdaf14b2c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lj_opt_fold.c
View File

@ -2293,14 +2293,16 @@ TRef LJ_FASTCALL lj_opt_fold(jit_State *J)
if (!(J->flags & JIT_F_OPT_FOLD) && irm_kind(lj_ir_mode[fins->o]) == IRM_N) if (!(J->flags & JIT_F_OPT_FOLD) && irm_kind(lj_ir_mode[fins->o]) == IRM_N)
return lj_opt_cse(J); return lj_opt_cse(J);
/* Forwarding or CSE disabled? Emit raw IR for loads, except for SLOAD. */ /* No FOLD, forwarding or CSE? Emit raw IR for loads, except for SLOAD. */
if ((J->flags & (JIT_F_OPT_FWD|JIT_F_OPT_CSE)) != if ((J->flags & (JIT_F_OPT_FOLD|JIT_F_OPT_FWD|JIT_F_OPT_CSE)) !=
(JIT_F_OPT_FWD|JIT_F_OPT_CSE) && (JIT_F_OPT_FOLD|JIT_F_OPT_FWD|JIT_F_OPT_CSE) &&
irm_kind(lj_ir_mode[fins->o]) == IRM_L && fins->o != IR_SLOAD) irm_kind(lj_ir_mode[fins->o]) == IRM_L && fins->o != IR_SLOAD)
return lj_ir_emit(J); return lj_ir_emit(J);
/* DSE disabled? Emit raw IR for stores. */ /* No FOLD or DSE? Emit raw IR for stores. */
if (!(J->flags & JIT_F_OPT_DSE) && irm_kind(lj_ir_mode[fins->o]) == IRM_S) if ((J->flags & (JIT_F_OPT_FOLD|JIT_F_OPT_DSE)) !=
(JIT_F_OPT_FOLD|JIT_F_OPT_DSE) &&
irm_kind(lj_ir_mode[fins->o]) == IRM_S)
return lj_ir_emit(J); return lj_ir_emit(J);
} }