diff options
| author | Mike Pall <mike> | 2013-04-09 16:35:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-04-09 16:35:02 +0200 |
| commit | e92e29dd4e23809cdc0fee795c68e8819eff0b54 (patch) | |
| tree | 6687bc02b6dcaf9f05eb9edefd60d7138ad6ee18 /src | |
| parent | 48912a2dea496e6640db75a261b105182ddbb7a6 (diff) | |
| parent | b1327bcf89ab58fe2824eff73fdec28bc9acc305 (diff) | |
| download | luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.tar.gz luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.tar.bz2 luajit-e92e29dd4e23809cdc0fee795c68e8819eff0b54.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_opt_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_opt_mem.c b/src/lj_opt_mem.c index bf77666b..98974ce3 100644 --- a/src/lj_opt_mem.c +++ b/src/lj_opt_mem.c | |||
| @@ -347,7 +347,7 @@ TRef LJ_FASTCALL lj_opt_dse_ahstore(jit_State *J) | |||
| 347 | IRIns *ir; | 347 | IRIns *ir; |
| 348 | /* Check for any intervening guards (includes conflicting loads). */ | 348 | /* Check for any intervening guards (includes conflicting loads). */ |
| 349 | for (ir = IR(J->cur.nins-1); ir > store; ir--) | 349 | for (ir = IR(J->cur.nins-1); ir > store; ir--) |
| 350 | if (irt_isguard(ir->t)) | 350 | if (irt_isguard(ir->t) || ir->o == IR_CALLL) |
| 351 | goto doemit; /* No elimination possible. */ | 351 | goto doemit; /* No elimination possible. */ |
| 352 | /* Remove redundant store from chain and replace with NOP. */ | 352 | /* Remove redundant store from chain and replace with NOP. */ |
| 353 | *refp = store->prev; | 353 | *refp = store->prev; |