Merge branch 'master' into v2.1

diff --cc src/lj_record.c
index 9d0469c42518ccaa03a4e7b1762929938c6dcb1e,cecacd218b4c3f30799423605e0cf81541b31bdb..c2d027456533bc2bcfd99e84c789b234006ba95c
--- 1/src/lj_record.c
--- 2/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) {