|
@@ -775,10 +775,12 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
|
|
pc = exd.pc;
|
|
pc = exd.pc;
|
|
cf = cframe_raw(L->cframe);
|
|
cf = cframe_raw(L->cframe);
|
|
setcframe_pc(cf, pc);
|
|
setcframe_pc(cf, pc);
|
|
- if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize)
|
|
|
|
- lj_gc_step(L); /* Exited because of GC: drive GC forward. */
|
|
|
|
- else
|
|
|
|
|
|
+ if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
|
|
|
|
+ if (!(G(L)->hookmask & HOOK_GC))
|
|
|
|
+ lj_gc_step(L); /* Exited because of GC: drive GC forward. */
|
|
|
|
+ } else {
|
|
trace_hotside(J, pc);
|
|
trace_hotside(J, pc);
|
|
|
|
+ }
|
|
if (bc_op(*pc) == BC_JLOOP) {
|
|
if (bc_op(*pc) == BC_JLOOP) {
|
|
BCIns *retpc = &traceref(J, bc_d(*pc))->startins;
|
|
BCIns *retpc = &traceref(J, bc_d(*pc))->startins;
|
|
if (bc_isret(bc_op(*retpc))) {
|
|
if (bc_isret(bc_op(*retpc))) {
|