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_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_step(L);  /* Exited because of GC: drive GC forward. */
+      lj_gc_check(L);  /* Exited because of GC: drive GC forward. */
  } else {
    trace_hotside(J, pc);
  }