Merge branch 'master' into v2.1

2 files changed, 3 insertions, 2 deletions

diff --git a/src/lj_gc.c b/src/lj_gc.c
index 592d770b..c41cef21 100644
--- 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) {
diff --git a/src/lj_trace.c b/src/lj_trace.c
index 466d9cd2..2b8d931f 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -781,7 +781,7 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
     /* Just exit to interpreter. */
   } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
     if (!(G(L)->hookmask & HOOK_GC))
-      lj_gc_check(L);  /* Exited because of GC: drive GC forward. */
+      lj_gc_step(L);  /* Exited because of GC: drive GC forward. */
   } else {
     trace_hotside(J, pc);
   }