Merge branch 'master' into v2.1

2014-04-22 11:29:05 +02:00
parent 39acdb8b7f 2715fe3aee
commit c8d1aff0ba
5 changed files with 9 additions and 6 deletions
--- 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)
      }
      lj_opt_split(J);
      lj_opt_sink(J);
+      if (!J->loopref) J->cur.snap[J->cur.nsnap-1].count = SNAPCOUNT_DONE;
      J->state = LJ_TRACE_ASM;
      break;