mirror of
https://github.com/LuaJIT/LuaJIT.git
synced 2025-02-07 23:24:09 +00:00
Merge branch 'master' into v2.1
This commit is contained in:
commit
6885efb73e
@ -905,8 +905,10 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
|
|||||||
exd.J = J;
|
exd.J = J;
|
||||||
exd.exptr = exptr;
|
exd.exptr = exptr;
|
||||||
errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp);
|
errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp);
|
||||||
if (errcode)
|
if (errcode) {
|
||||||
|
setcframe_pc(cframe_raw(L->cframe), L); /* Point to any valid memory. */
|
||||||
return -errcode; /* Return negated error code. */
|
return -errcode; /* Return negated error code. */
|
||||||
|
}
|
||||||
|
|
||||||
if (exitcode) copyTV(L, L->top++, &exiterr); /* Anchor the error object. */
|
if (exitcode) copyTV(L, L->top++, &exiterr); /* Anchor the error object. */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user