diff options
| author | Mike Pall <mike> | 2013-11-22 05:14:37 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-11-22 05:14:37 +0100 |
| commit | b00a0260dd7cd08a136efd085585208dd85076df (patch) | |
| tree | 29720066d2e3b773f53694d9b14aeb90796f6bba /src/lj_trace.c | |
| parent | 94bfa7cfa6eef3b9911d4f6efae6f19a4f447dd3 (diff) | |
| parent | 9d909883474e0079227aed20a50122b5969ed429 (diff) | |
| download | luajit-b00a0260dd7cd08a136efd085585208dd85076df.tar.gz luajit-b00a0260dd7cd08a136efd085585208dd85076df.tar.bz2 luajit-b00a0260dd7cd08a136efd085585208dd85076df.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_trace.c')
| -rw-r--r-- | src/lj_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c index 466d9cd2a..2b8d931ff 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) | |||
| 781 | /* Just exit to interpreter. */ | 781 | /* Just exit to interpreter. */ |
| 782 | } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { | 782 | } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { |
| 783 | if (!(G(L)->hookmask & HOOK_GC)) | 783 | if (!(G(L)->hookmask & HOOK_GC)) |
| 784 | lj_gc_check(L); /* Exited because of GC: drive GC forward. */ | 784 | lj_gc_step(L); /* Exited because of GC: drive GC forward. */ |
| 785 | } else { | 785 | } else { |
| 786 | trace_hotside(J, pc); | 786 | trace_hotside(J, pc); |
| 787 | } | 787 | } |