diff options
| author | Mike Pall <mike> | 2023-12-23 19:23:12 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2023-12-23 19:23:12 +0100 |
| commit | 293199c5eba1e3036d975c045947051d9e160b48 (patch) | |
| tree | f190fbb3424dd1b730c6c6c712c0eebcf091d093 | |
| parent | e02a207909f5fb8dc1e58a999b6af0e346cd17e2 (diff) | |
| parent | 7dbe545933485849977d50384f2f20f2cccf0cf9 (diff) | |
| download | luajit-293199c5eba1e3036d975c045947051d9e160b48.tar.gz luajit-293199c5eba1e3036d975c045947051d9e160b48.tar.bz2 luajit-293199c5eba1e3036d975c045947051d9e160b48.zip | |
Merge branch 'master' into v2.1
| -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 fee78e2e..a5e316e1 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c | |||
| @@ -928,7 +928,7 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) | |||
| 928 | } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { | 928 | } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { |
| 929 | if (!(G(L)->hookmask & HOOK_GC)) | 929 | if (!(G(L)->hookmask & HOOK_GC)) |
| 930 | lj_gc_step(L); /* Exited because of GC: drive GC forward. */ | 930 | lj_gc_step(L); /* Exited because of GC: drive GC forward. */ |
| 931 | } else { | 931 | } else if ((J->flags & JIT_F_ON)) { |
| 932 | trace_hotside(J, pc); | 932 | trace_hotside(J, pc); |
| 933 | } | 933 | } |
| 934 | /* Return MULTRES or 0 or -17. */ | 934 | /* Return MULTRES or 0 or -17. */ |