diff options
| author | Mike Pall <mike> | 2017-05-09 21:01:23 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-05-09 21:01:23 +0200 |
| commit | 31afda31814ec02f82ffb0519bee496c87eeaa89 (patch) | |
| tree | 696ebfe12cbf8d6ed236c9965253b21f056b5acf /src | |
| parent | 8271c643c21d1b2f344e339f559f2de6f3663191 (diff) | |
| parent | 1c89933f129dde76944336c6bfd05297b8d67730 (diff) | |
| download | luajit-31afda31814ec02f82ffb0519bee496c87eeaa89.tar.gz luajit-31afda31814ec02f82ffb0519bee496c87eeaa89.tar.bz2 luajit-31afda31814ec02f82ffb0519bee496c87eeaa89.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_record.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 9d0469c4..c2d02745 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -87,9 +87,9 @@ static void rec_check_slots(jit_State *J) | |||
| 87 | BCReg s, nslots = J->baseslot + J->maxslot; | 87 | BCReg s, nslots = J->baseslot + J->maxslot; |
| 88 | int32_t depth = 0; | 88 | int32_t depth = 0; |
| 89 | cTValue *base = J->L->base - J->baseslot; | 89 | cTValue *base = J->L->base - J->baseslot; |
| 90 | lua_assert(J->baseslot >= 1+LJ_FR2 && J->baseslot < LJ_MAX_JSLOTS); | 90 | lua_assert(J->baseslot >= 1+LJ_FR2); |
| 91 | lua_assert(J->baseslot == 1+LJ_FR2 || (J->slot[J->baseslot-1] & TREF_FRAME)); | 91 | lua_assert(J->baseslot == 1+LJ_FR2 || (J->slot[J->baseslot-1] & TREF_FRAME)); |
| 92 | lua_assert(nslots < LJ_MAX_JSLOTS); | 92 | lua_assert(nslots <= LJ_MAX_JSLOTS); |
| 93 | for (s = 0; s < nslots; s++) { | 93 | for (s = 0; s < nslots; s++) { |
| 94 | TRef tr = J->slot[s]; | 94 | TRef tr = J->slot[s]; |
| 95 | if (tr) { | 95 | if (tr) { |