Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-05-17 17:38:53 +02:00
commit 6259c0b909

View File

@ -731,6 +731,8 @@ void lj_record_call(jit_State *J, BCReg func, ptrdiff_t nargs)
J->framedepth++;
J->base += func+1+LJ_FR2;
J->baseslot += func+1+LJ_FR2;
if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
lj_trace_err(J, LJ_TRERR_STACKOV);
}
/* Record tail call. */