gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +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-06-18 20:10:22 +02:00
commit edc7f35ab3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lj_opt_mem.c
View File

@ -396,13 +396,13 @@ static AliasRet aa_uref(IRIns *refa, IRIns *refb)
TRef LJ_FASTCALL lj_opt_fwd_uload(jit_State *J)
{
IRRef uref = fins->op1;
IRRef lim = uref; /* Search limit. */
IRRef lim = REF_BASE; /* Search limit. */
IRIns *xr = IR(uref);
IRRef ref;
/* Search for conflicting stores. */
ref = J->chain[IR_USTORE];
while (ref > uref) {
while (ref > lim) {
IRIns *store = IR(ref);
switch (aa_uref(xr, IR(store->op1))) {
case ALIAS_NO: break; /* Continue searching. */
@ -414,7 +414,16 @@ TRef LJ_FASTCALL lj_opt_fwd_uload(jit_State *J)
cselim:
/* Try to find a matching load. Below the conflicting store, if any. */
return lj_opt_cselim(J, lim);
ref = J->chain[IR_ULOAD];
while (ref > lim) {
IRIns *ir = IR(ref);
if (ir->op1 == uref ||
(IR(ir->op1)->op12 == IR(uref)->op12 && IR(ir->op1)->o == IR(uref)->o))
return ref; /* Match for identical or equal UREFx (non-CSEable UREFO). */
ref = ir->prev;
}
return lj_ir_emit(J);
}
/* USTORE elimination. */