diff options
| author | Mike Pall <mike> | 2016-03-28 22:17:41 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-03-28 22:17:41 +0200 |
| commit | df7bb5bb7219cd9f3238a2a098e1846f5592e16f (patch) | |
| tree | 95d0ff41d899ab20e3c0fa8eb008a1fa866178c9 | |
| parent | c7305408d150e1ca51195e8f31e4e3e6bd6b7c33 (diff) | |
| parent | e23fc1088303ef9e534c9170c10afb02a25e9b86 (diff) | |
| download | luajit-df7bb5bb7219cd9f3238a2a098e1846f5592e16f.tar.gz luajit-df7bb5bb7219cd9f3238a2a098e1846f5592e16f.tar.bz2 luajit-df7bb5bb7219cd9f3238a2a098e1846f5592e16f.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/jit/dump.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index 9d8330e1..9a722f73 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -331,7 +331,7 @@ local function formatk(tr, idx) | |||
| 331 | s = format("userdata:%p", k) | 331 | s = format("userdata:%p", k) |
| 332 | else | 332 | else |
| 333 | s = format("[%p]", k) | 333 | s = format("[%p]", k) |
| 334 | if s == "[0x00000000]" then s = "NULL" end | 334 | if s == "[NULL]" then s = "NULL" end |
| 335 | end | 335 | end |
| 336 | elseif t == 21 then -- int64_t | 336 | elseif t == 21 then -- int64_t |
| 337 | s = sub(tostring(k), 1, -3) | 337 | s = sub(tostring(k), 1, -3) |