Merge branch 'master' into v2.1

2013-11-05 19:41:21 +01:00
parent 0315b87352 7b4d5306c7
commit 5c55b766bd
2 changed files with 5 additions and 3 deletions
--- a/src/lj_gc.c
+++ b/src/lj_gc.c
@@ -684,12 +684,14 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
  } while ((int32_t)lim > 0);
  if (g->gc.debt < GCSTEPSIZE) {
    g->gc.threshold = g->gc.total + GCSTEPSIZE;
+    g->vmstate = ostate;
+    return 1;
  } else {
    g->gc.debt -= GCSTEPSIZE;
    g->gc.threshold = g->gc.total;
+    g->vmstate = ostate;
+    return 0;
  }
-  g->vmstate = ostate;
-  return 0;
 }

 /* Ditto, but fix the stack top first. */