diff options
| author | Mike Pall <mike> | 2013-11-22 05:42:56 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-11-22 05:42:56 +0100 |
| commit | f371ed6bd8741834b4b0278cf2c9e95e32f2cb26 (patch) | |
| tree | 52c4c461288427cf2705a36af2f8d485bf6b50d8 | |
| parent | 9d909883474e0079227aed20a50122b5969ed429 (diff) | |
| download | luajit2-f371ed6bd8741834b4b0278cf2c9e95e32f2cb26.tar.gz | |
Respect jit.off(func) when returning to a function, too.
| -rw-r--r-- | src/lj_record.c | 2 | ||||
| -rw-r--r-- | src/lj_traceerr.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 7336e0ac..30b9efc1 100644 --- a/src/lj_record.c +++ b/src/lj_record.c @@ -722,6 +722,8 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults) ptrdiff_t nresults = bc_b(callins) ? (ptrdiff_t)bc_b(callins)-1 :gotresults; BCReg cbase = bc_a(callins); GCproto *pt = funcproto(frame_func(frame - (cbase+1))); + if ((pt->flags & PROTO_NOJIT)) + lj_trace_err(J, LJ_TRERR_CJITOFF); if (J->framedepth == 0 && J->pt && frame == J->L->base - 1) { if (check_downrec_unroll(J, pt)) { J->maxslot = (BCReg)(rbase + gotresults); diff --git a/src/lj_traceerr.h b/src/lj_traceerr.h index 2ef4ad63..8f463ca6 100644 --- a/src/lj_traceerr.h +++ b/src/lj_traceerr.h @@ -20,7 +20,7 @@ TREDEF(LUNROLL, "loop unroll limit reached") /* Recording calls/returns. */ TREDEF(BADTYPE, "bad argument type") -TREDEF(CJITOFF, "call to JIT-disabled function") +TREDEF(CJITOFF, "JIT compilation disabled for function") TREDEF(CUNROLL, "call unroll limit reached") TREDEF(DOWNREC, "down-recursion, restarting") TREDEF(NYICF, "NYI: C function %p") |