aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2023-12-23 19:22:34 +0100
committerMike Pall <mike>2023-12-23 19:22:34 +0100
commit7dbe545933485849977d50384f2f20f2cccf0cf9 (patch)
treeec7cd64b60df40ea121e61f496db178c354f8869
parentc42c62e71a45a677b8b1cbf749bd33cf4d5918ff (diff)
downloadluajit-7dbe545933485849977d50384f2f20f2cccf0cf9.tar.gz
luajit-7dbe545933485849977d50384f2f20f2cccf0cf9.tar.bz2
luajit-7dbe545933485849977d50384f2f20f2cccf0cf9.zip
Respect jit.off() on pending trace exit.
Thanks to Sergey Kaplun. #1134
-rw-r--r--src/lj_trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c
index 25e610b5..d015f2ab 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -804,7 +804,7 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
804 if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { 804 if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
805 if (!(G(L)->hookmask & HOOK_GC)) 805 if (!(G(L)->hookmask & HOOK_GC))
806 lj_gc_step(L); /* Exited because of GC: drive GC forward. */ 806 lj_gc_step(L); /* Exited because of GC: drive GC forward. */
807 } else { 807 } else if ((J->flags & JIT_F_ON)) {
808 trace_hotside(J, pc); 808 trace_hotside(J, pc);
809 } 809 }
810 if (bc_op(*pc) == BC_JLOOP) { 810 if (bc_op(*pc) == BC_JLOOP) {