From: Mike Pall <mike>
Date: Fri, 22 Nov 2013 04:14:37 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.0-beta1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00a0260dd7cd08a136efd085585208dd85076df;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

b00a0260dd7cd08a136efd085585208dd85076df
diff --cc src/lj_trace.c
index 466d9cd2,c70fc247..2b8d931f
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@@ -777,11 -776,9 +777,11 @@@ int LJ_FASTCALL lj_trace_exit(jit_Stat
    pc = exd.pc;
    cf = cframe_raw(L->cframe);
    setcframe_pc(cf, pc);
 -  if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
 +  if (LJ_HASPROFILE && (G(L)->hookmask & HOOK_PROFILE)) {
 +    /* 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);
    }