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
8625eee71f
@ -1945,6 +1945,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
|
|||||||
} else if (dst + nresults > J->maxslot) {
|
} else if (dst + nresults > J->maxslot) {
|
||||||
J->maxslot = dst + (BCReg)nresults;
|
J->maxslot = dst + (BCReg)nresults;
|
||||||
}
|
}
|
||||||
|
if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
|
||||||
|
lj_trace_err(J, LJ_TRERR_STACKOV);
|
||||||
for (i = 0; i < nresults; i++)
|
for (i = 0; i < nresults; i++)
|
||||||
J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1 - LJ_FR2) : TREF_NIL;
|
J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1 - LJ_FR2) : TREF_NIL;
|
||||||
} else { /* Unknown number of varargs passed to trace. */
|
} else { /* Unknown number of varargs passed to trace. */
|
||||||
@ -2022,8 +2024,6 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
|
|||||||
lj_trace_err_info(J, LJ_TRERR_NYIBC);
|
lj_trace_err_info(J, LJ_TRERR_NYIBC);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
|
|
||||||
lj_trace_err(J, LJ_TRERR_STACKOV);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- Record allocations -------------------------------------------------- */
|
/* -- Record allocations -------------------------------------------------- */
|
||||||
|
Loading…
Reference in New Issue
Block a user