Merge branch 'master' into v2.1

2014-02-28 14:10:30 +01:00
parent b342b7a0eb e94150877d
commit fd3354a9dd
2 changed files with 2 additions and 6 deletions
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -554,10 +554,8 @@ local function dump_trace(what, tr, func, pc, otr, oex)
    out:write("---- TRACE ", tr, " ", what)
    if otr then out:write(" ", otr, "/", oex) end
    out:write(" ", fmtfunc(func, pc), "\n")
-    recprefix = ""
  elseif what == "stop" or what == "abort" then
    out:write("---- TRACE ", tr, " ", what)
-    recprefix = nil
    if what == "abort" then
      out:write(" ", fmtfunc(func, pc), " -- ", fmterr(otr, oex), "\n")
    else