lj_record.c: Relax heuristic for root trace meeting JIT loop

snabbco · Jan 8, 2018 · 5443940 · 5443940
1 parent c685d8b
commit 5443940
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/luajit/src/lj_record.c b/lib/luajit/src/lj_record.c
@@ -595,7 +595,8 @@ static void rec_loop_interp(jit_State *J, const BCIns *pc, LoopEvent ev)
 /* Handle the case when an already compiled loop op is hit. */
 static void rec_loop_jit(jit_State *J, TraceNo lnk, LoopEvent ev)
 {
-  if (J->parent == 0 && J->exitno == 0) {  /* Root trace hit an inner loop. */
+  /* Root trace hit an inner loop. */
+  if (J->parent == 0 && J->exitno == 0 && !innerloopleft(J, J->startpc)) {
     /* Better let the inner loop spawn a side trace back here. */
     lj_trace_err(J, LJ_TRERR_LINNER);
   } else if (ev != LOOPEV_LEAVE) {  /* Side trace enters a compiled loop. */