Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-04-01 10:33:42 +02:00
commit a972d37ef3

View File

@ -440,7 +440,7 @@ static LoopEvent rec_for(jit_State *J, const BCIns *fori, int isforl)
IRType t; IRType t;
if (isforl) { /* Handle FORL/JFORL opcodes. */ if (isforl) { /* Handle FORL/JFORL opcodes. */
TRef idx = tr[FORL_IDX]; TRef idx = tr[FORL_IDX];
if (mref(J->scev.pc, const BCIns) == fori) { if (mref(J->scev.pc, const BCIns) == fori && tref_ref(idx) == J->scev.idx) {
t = J->scev.t.irt; t = J->scev.t.irt;
stop = J->scev.stop; stop = J->scev.stop;
idx = emitir(IRT(IR_ADD, t), idx, J->scev.step); idx = emitir(IRT(IR_ADD, t), idx, J->scev.step);