mirror of
https://github.com/LuaJIT/LuaJIT.git
synced 2025-02-07 15:14:08 +00:00
Merge branch 'master' into v2.1
This commit is contained in:
commit
bd55d3023f
@ -1942,12 +1942,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
|
|||||||
if (J->framedepth > 0) { /* Simple case: varargs defined on-trace. */
|
if (J->framedepth > 0) { /* Simple case: varargs defined on-trace. */
|
||||||
ptrdiff_t i;
|
ptrdiff_t i;
|
||||||
if (nvararg < 0) nvararg = 0;
|
if (nvararg < 0) nvararg = 0;
|
||||||
if (nresults == -1) {
|
if (nresults == -1) nresults = nvararg;
|
||||||
nresults = nvararg;
|
J->maxslot = dst + (BCReg)nresults;
|
||||||
J->maxslot = dst + (BCReg)nvararg;
|
|
||||||
} else if (dst + nresults > J->maxslot) {
|
|
||||||
J->maxslot = dst + (BCReg)nresults;
|
|
||||||
}
|
|
||||||
if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
|
if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
|
||||||
lj_trace_err(J, LJ_TRERR_STACKOV);
|
lj_trace_err(J, LJ_TRERR_STACKOV);
|
||||||
for (i = 0; i < nresults; i++)
|
for (i = 0; i < nresults; i++)
|
||||||
|
Loading…
Reference in New Issue
Block a user