From 96e8a56260cd3bd76bc824e43d824140a303a159 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Fri, 29 Jan 2010 15:07:40 +0100
Subject: [PATCH] Loop formation test must check for return to lower frame.

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

diff --git a/src/lj_record.c b/src/lj_record.c
index 03fcb966..cded81e0 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -368,7 +368,8 @@ static int innerloopleft(jit_State *J, const BCIns *pc)
 static void rec_loop_interp(jit_State *J, const BCIns *pc, LoopEvent ev)
 {
   if (J->parent == 0) {
-    if (pc == J->startpc && J->framedepth == 0) {  /* Same loop? */
+    if (pc == J->startpc && J->framedepth == 0 && !J->chain[IR_RETF]) {
+      /* Same loop? */
       if (ev == LOOPEV_LEAVE)  /* Must loop back to form a root trace. */
 	lj_trace_err(J, LJ_TRERR_LLEAVE);
       rec_stop(J, J->curtrace);  /* Root trace forms a loop. */