From: Mike Pall <mike>
Date: Tue, 9 May 2017 19:01:23 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.ROLLING~360
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31afda31814ec02f82ffb0519bee496c87eeaa89;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

31afda31814ec02f82ffb0519bee496c87eeaa89
diff --cc src/lj_record.c
index 9d0469c4,cecacd21..c2d02745
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@@ -87,9 -81,9 +87,9 @@@ static void rec_check_slots(jit_State *
    BCReg s, nslots = J->baseslot + J->maxslot;
    int32_t depth = 0;
    cTValue *base = J->L->base - J->baseslot;
-   lua_assert(J->baseslot >= 1+LJ_FR2 && J->baseslot < LJ_MAX_JSLOTS);
 -  lua_assert(J->baseslot >= 1);
 -  lua_assert(J->baseslot == 1 || (J->slot[J->baseslot-1] & TREF_FRAME));
++  lua_assert(J->baseslot >= 1+LJ_FR2);
 +  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++) {
      TRef tr = J->slot[s];
      if (tr) {