diff options
| author | Mike Pall <mike> | 2014-04-01 10:33:42 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-01 10:33:42 +0200 |
| commit | a972d37ef301dfc7cb78830307f51bd4f9bb617b (patch) | |
| tree | d50dcdcedac58b975a3f05456b10449a250adb1a | |
| parent | 423f10fb40a273cf3c9dc605b86469efa8c089a3 (diff) | |
| parent | b293063eb823160d3f87c1d56f98a742ee8ee58e (diff) | |
| download | luajit-a972d37ef301dfc7cb78830307f51bd4f9bb617b.tar.gz luajit-a972d37ef301dfc7cb78830307f51bd4f9bb617b.tar.bz2 luajit-a972d37ef301dfc7cb78830307f51bd4f9bb617b.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index ca833df2..5e11a48b 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -440,7 +440,7 @@ static LoopEvent rec_for(jit_State *J, const BCIns *fori, int isforl) | |||
| 440 | IRType t; | 440 | IRType t; |
| 441 | if (isforl) { /* Handle FORL/JFORL opcodes. */ | 441 | if (isforl) { /* Handle FORL/JFORL opcodes. */ |
| 442 | TRef idx = tr[FORL_IDX]; | 442 | TRef idx = tr[FORL_IDX]; |
| 443 | if (mref(J->scev.pc, const BCIns) == fori) { | 443 | if (mref(J->scev.pc, const BCIns) == fori && tref_ref(idx) == J->scev.idx) { |
| 444 | t = J->scev.t.irt; | 444 | t = J->scev.t.irt; |
| 445 | stop = J->scev.stop; | 445 | stop = J->scev.stop; |
| 446 | idx = emitir(IRT(IR_ADD, t), idx, J->scev.step); | 446 | idx = emitir(IRT(IR_ADD, t), idx, J->scev.step); |