Avoid recursive GC steps after GC-triggered trace exit.

diff --git a/src/lj_trace.c b/src/lj_trace.c
index c1a22518c220601449dcc8097c8a9911fdae7b17..ad00dc67a9e7d13a47920fce0c2081215d371e7b 100644 (file)
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -775,10 +775,12 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
   pc = exd.pc;
   cf = cframe_raw(L->cframe);
   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);
+  }
   if (bc_op(*pc) == BC_JLOOP) {
     BCIns *retpc = &traceref(J, bc_d(*pc))->startins;
     if (bc_isret(bc_op(*retpc))) {