diff options
| author | Mike Pall <mike> | 2010-02-03 14:31:42 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2010-02-03 14:31:42 +0100 |
| commit | 305ecbbb84e18bb6b8a90402ca38c604c64c7bd8 (patch) | |
| tree | 1cc2124cde6a17eb31734f12f517585dc86f62c7 /src | |
| parent | 61c5a60dc35d96125297ca5bdadc33a3e7565036 (diff) | |
| download | luajit-305ecbbb84e18bb6b8a90402ca38c604c64c7bd8.tar.gz luajit-305ecbbb84e18bb6b8a90402ca38c604c64c7bd8.tar.bz2 luajit-305ecbbb84e18bb6b8a90402ca38c604c64c7bd8.zip | |
Another loop formation test must check for return to lower frame.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 401 | lj_trace_err(J, LJ_TRERR_LINNER); | 401 | lj_trace_err(J, LJ_TRERR_LINNER); |
| 402 | } else if (ev != LOOPEV_LEAVE) { /* Side trace enters a compiled loop. */ | 402 | } else if (ev != LOOPEV_LEAVE) { /* Side trace enters a compiled loop. */ |
| 403 | J->instunroll = 0; /* Cannot continue across a compiled loop op. */ | 403 | J->instunroll = 0; /* Cannot continue across a compiled loop op. */ |
| 404 | if (J->pc == J->startpc && J->framedepth == 0) | 404 | if (J->pc == J->startpc && J->framedepth == 0 && !J->chain[IR_RETF]) |
| 405 | lnk = J->curtrace; /* Can form an extra loop. */ | 405 | lnk = J->curtrace; /* Can form an extra loop. */ |
| 406 | rec_stop(J, lnk); /* Link to the loop. */ | 406 | rec_stop(J, lnk); /* Link to the loop. */ |
| 407 | } /* Side trace continues across a loop that's left or not entered. */ | 407 | } /* Side trace continues across a loop that's left or not entered. */ |