From 305ecbbb84e18bb6b8a90402ca38c604c64c7bd8 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 3 Feb 2010 14:31:42 +0100
Subject: [PATCH] Another loop formation test must check for return to lower
 frame.

---
 src/lj_record.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lj_record.c b/src/lj_record.c
index cded81e0..a32d19f0 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -401,7 +401,7 @@ static void rec_loop_jit(jit_State *J, TraceNo lnk, LoopEvent ev)
     lj_trace_err(J, LJ_TRERR_LINNER);
   } else if (ev != LOOPEV_LEAVE) {  /* Side trace enters a compiled loop. */
     J->instunroll = 0;  /* Cannot continue across a compiled loop op. */
-    if (J->pc == J->startpc && J->framedepth == 0)
+    if (J->pc == J->startpc && J->framedepth == 0 && !J->chain[IR_RETF])
       lnk = J->curtrace;  /* Can form an extra loop. */
     rec_stop(J, lnk);  /* Link to the loop. */
   }  /* Side trace continues across a loop that's left or not entered. */