diff options
| author | Mike Pall <mike> | 2013-08-11 13:52:05 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-08-11 13:52:05 +0200 |
| commit | 9b14426c095c439022a1f6bb85911a21074aabb3 (patch) | |
| tree | 9900c7dd3d4617721ce40088a659df7c1e07cd69 | |
| parent | f5fba4838649d83a58cca90474929a1f0f70cf8c (diff) | |
| parent | 362260b24a7d6f73a2dfe36964441898ebaae8bc (diff) | |
| download | luajit-9b14426c095c439022a1f6bb85911a21074aabb3.tar.gz luajit-9b14426c095c439022a1f6bb85911a21074aabb3.tar.bz2 luajit-9b14426c095c439022a1f6bb85911a21074aabb3.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lib_jit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_jit.c b/src/lib_jit.c index 555e581c..47663b72 100644 --- a/src/lib_jit.c +++ b/src/lib_jit.c | |||
| @@ -77,7 +77,7 @@ LJLIB_CF(jit_off) | |||
| 77 | LJLIB_CF(jit_flush) | 77 | LJLIB_CF(jit_flush) |
| 78 | { | 78 | { |
| 79 | #if LJ_HASJIT | 79 | #if LJ_HASJIT |
| 80 | if (L->base < L->top && !tvisnil(L->base)) { | 80 | if (L->base < L->top && tvisnumber(L->base)) { |
| 81 | int traceno = lj_lib_checkint(L, 1); | 81 | int traceno = lj_lib_checkint(L, 1); |
| 82 | luaJIT_setmode(L, traceno, LUAJIT_MODE_FLUSH|LUAJIT_MODE_TRACE); | 82 | luaJIT_setmode(L, traceno, LUAJIT_MODE_FLUSH|LUAJIT_MODE_TRACE); |
| 83 | return 0; | 83 | return 0; |