Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2020-11-30 15:46:56 +01:00
commit 652f71bb1d

View File

@ -584,7 +584,7 @@ local function dump_trace(what, tr, func, pc, otr, oex)
end
-- Dump recorded bytecode.
local function dump_record(tr, func, pc, depth, callee)
local function dump_record(tr, func, pc, depth)
if depth ~= recdepth then
recdepth = depth
recprefix = rep(" .", depth)
@ -595,7 +595,6 @@ local function dump_record(tr, func, pc, depth, callee)
if dumpmode.H then line = gsub(line, "[<>&]", html_escape) end
else
line = "0000 "..recprefix.." FUNCC \n"
callee = func
end
if pc <= 0 then
out:write(sub(line, 1, -2), " ; ", fmtfunc(func), "\n")