From: Mike Pall <mike>
Date: Wed, 3 Feb 2010 13:31:42 +0000 (+0100)
Subject: Another loop formation test must check for return to lower frame.
X-Git-Tag: v2.0.0-beta3~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=305ecbbb84e18bb6b8a90402ca38c604c64c7bd8;p=thirdparty%2FLuaJIT.git

Another loop formation test must check for return to lower frame.
---

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. */