Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-05-09 21:01:23 +02:00
commit 31afda3181

View File

@ -87,9 +87,9 @@ static void rec_check_slots(jit_State *J)
BCReg s, nslots = J->baseslot + J->maxslot; BCReg s, nslots = J->baseslot + J->maxslot;
int32_t depth = 0; int32_t depth = 0;
cTValue *base = J->L->base - J->baseslot; cTValue *base = J->L->base - J->baseslot;
lua_assert(J->baseslot >= 1+LJ_FR2 && J->baseslot < LJ_MAX_JSLOTS); lua_assert(J->baseslot >= 1+LJ_FR2);
lua_assert(J->baseslot == 1+LJ_FR2 || (J->slot[J->baseslot-1] & TREF_FRAME)); lua_assert(J->baseslot == 1+LJ_FR2 || (J->slot[J->baseslot-1] & TREF_FRAME));
lua_assert(nslots < LJ_MAX_JSLOTS); lua_assert(nslots <= LJ_MAX_JSLOTS);
for (s = 0; s < nslots; s++) { for (s = 0; s < nslots; s++) {
TRef tr = J->slot[s]; TRef tr = J->slot[s];
if (tr) { if (tr) {