Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2023-12-23 19:23:12 +01:00
commit 293199c5eb

View File

@ -928,7 +928,7 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
} else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
if (!(G(L)->hookmask & HOOK_GC)) if (!(G(L)->hookmask & HOOK_GC))
lj_gc_step(L); /* Exited because of GC: drive GC forward. */ lj_gc_step(L); /* Exited because of GC: drive GC forward. */
} else { } else if ((J->flags & JIT_F_ON)) {
trace_hotside(J, pc); trace_hotside(J, pc);
} }
/* Return MULTRES or 0 or -17. */ /* Return MULTRES or 0 or -17. */