Merge branch 'master' into v2.1

2016-03-28 22:17:41 +02:00
parent c7305408d1 e23fc10883
commit df7bb5bb72
1 changed files with 1 additions and 1 deletions
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -331,7 +331,7 @@ local function formatk(tr, idx)
      s = format("userdata:%p", k)
    else
      s = format("[%p]", k)
-      if s == "[0x00000000]" then s = "NULL" end
+      if s == "[NULL]" then s = "NULL" end
    end
  elseif t == 21 then -- int64_t
    s = sub(tostring(k), 1, -3)