diff options
| author | Mike Pall <mike> | 2015-02-18 16:01:11 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-02-18 16:01:11 +0100 |
| commit | 063f3d5d7c4827a746bb00fda3992a35273b0d2b (patch) | |
| tree | e8ddc06201cd6d8e089434192d4e09ca5abf7843 | |
| parent | 04dc64b558025e76a820f89a8e41840bf8269f32 (diff) | |
| parent | 704280fb80d5320b20f6cd20cfbf009a999164f0 (diff) | |
| download | luajit-063f3d5d7c4827a746bb00fda3992a35273b0d2b.tar.gz luajit-063f3d5d7c4827a746bb00fda3992a35273b0d2b.tar.bz2 luajit-063f3d5d7c4827a746bb00fda3992a35273b0d2b.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_opt_mem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_opt_mem.c b/src/lj_opt_mem.c index 2b6fc884..e04a6228 100644 --- a/src/lj_opt_mem.c +++ b/src/lj_opt_mem.c | |||
| @@ -808,6 +808,7 @@ TRef LJ_FASTCALL lj_opt_dse_xstore(jit_State *J) | |||
| 808 | IRRef ref = *refp; | 808 | IRRef ref = *refp; |
| 809 | if (J->chain[IR_CALLXS] > lim) lim = J->chain[IR_CALLXS]; | 809 | if (J->chain[IR_CALLXS] > lim) lim = J->chain[IR_CALLXS]; |
| 810 | if (J->chain[IR_XBAR] > lim) lim = J->chain[IR_XBAR]; | 810 | if (J->chain[IR_XBAR] > lim) lim = J->chain[IR_XBAR]; |
| 811 | if (J->chain[IR_XSNEW] > lim) lim = J->chain[IR_XSNEW]; | ||
| 811 | while (ref > lim) { /* Search for redundant or conflicting stores. */ | 812 | while (ref > lim) { /* Search for redundant or conflicting stores. */ |
| 812 | IRIns *store = IR(ref); | 813 | IRIns *store = IR(ref); |
| 813 | switch (aa_xref(J, xr, fins, store)) { | 814 | switch (aa_xref(J, xr, fins, store)) { |