diff options
| author | Mike Pall <mike> | 2014-07-01 17:54:08 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-07-01 17:54:08 +0200 |
| commit | 0ac4c439654c94e48c5625aa2d7b8c405ebe1e90 (patch) | |
| tree | 8ab7c08cff879f1a64fd5252064b97742806ba14 /src/lj_record.c | |
| parent | 1cb5929c5c0ec3a146410cc4b8edc15040da55ca (diff) | |
| parent | a6c34b85f776d8c83b0c01cbdc50550e613d1fda (diff) | |
| download | luajit-0ac4c439654c94e48c5625aa2d7b8c405ebe1e90.tar.gz luajit-0ac4c439654c94e48c5625aa2d7b8c405ebe1e90.tar.bz2 luajit-0ac4c439654c94e48c5625aa2d7b8c405ebe1e90.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_record.c')
| -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 5e11a48b..02171300 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -1142,7 +1142,7 @@ static void rec_idx_abc(jit_State *J, TRef asizeref, TRef ikey, uint32_t asize) | |||
| 1142 | lua_assert(irt_isint(J->scev.t) && ir->o == IR_SLOAD); | 1142 | lua_assert(irt_isint(J->scev.t) && ir->o == IR_SLOAD); |
| 1143 | stop = numberVint(&(J->L->base - J->baseslot)[ir->op1 + FORL_STOP]); | 1143 | stop = numberVint(&(J->L->base - J->baseslot)[ir->op1 + FORL_STOP]); |
| 1144 | /* Runtime value for stop of loop is within bounds? */ | 1144 | /* Runtime value for stop of loop is within bounds? */ |
| 1145 | if ((int64_t)stop + ofs < (int64_t)asize) { | 1145 | if ((uint64_t)stop + ofs < (uint64_t)asize) { |
| 1146 | /* Emit invariant bounds check for stop. */ | 1146 | /* Emit invariant bounds check for stop. */ |
| 1147 | emitir(IRTG(IR_ABC, IRT_P32), asizeref, ofs == 0 ? J->scev.stop : | 1147 | emitir(IRTG(IR_ABC, IRT_P32), asizeref, ofs == 0 ? J->scev.stop : |
| 1148 | emitir(IRTI(IR_ADD), J->scev.stop, ofsref)); | 1148 | emitir(IRTI(IR_ADD), J->scev.stop, ofsref)); |