diff options
| author | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
| commit | c8d1aff0bafcbfadb4a119685708c19788158cd6 (patch) | |
| tree | 9501d4b89549058b727c386aac980da075df4995 /src/lj_trace.c | |
| parent | 39acdb8b7f8542373d6a47538f9a712baa8fe7d6 (diff) | |
| parent | 2715fe3aee7c8202b4b5d04748d1c5faa6d8fd9c (diff) | |
| download | luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.gz luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.bz2 luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_trace.c')
| -rw-r--r-- | src/lj_trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c index 7bb6c8ae..f386b95e 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c | |||
| @@ -618,6 +618,7 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud) | |||
| 618 | } | 618 | } |
| 619 | lj_opt_split(J); | 619 | lj_opt_split(J); |
| 620 | lj_opt_sink(J); | 620 | lj_opt_sink(J); |
| 621 | if (!J->loopref) J->cur.snap[J->cur.nsnap-1].count = SNAPCOUNT_DONE; | ||
| 621 | J->state = LJ_TRACE_ASM; | 622 | J->state = LJ_TRACE_ASM; |
| 622 | break; | 623 | break; |
| 623 | 624 | ||