Merge branch 'master' into v2.1

2013-11-22 05:14:37 +01:00
parent 94bfa7cfa6 9d90988347
commit b00a0260dd
2 changed files with 3 additions and 2 deletions
--- a/src/lj_gc.c
+++ b/src/lj_gc.c
@@ -673,7 +673,8 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
  lim = (GCSTEPSIZE/100) * g->gc.stepmul;
  if (lim == 0)
    lim = LJ_MAX_MEM;
-  g->gc.debt += g->gc.total - g->gc.threshold;
+  if (g->gc.total > g->gc.threshold)
+    g->gc.debt += g->gc.total - g->gc.threshold;
  do {
    lim -= (MSize)gc_onestep(L);
    if (g->gc.state == GCSpause) {