diff options
| author | Mike Pall <mike> | 2020-11-30 15:46:56 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-11-30 15:46:56 +0100 |
| commit | 652f71bb1d0b540647c7fee42a312ceb808f9cf3 (patch) | |
| tree | 5eebcdada18b709552d2ff0ef7e9fa68b82dad88 /src/jit | |
| parent | 1d8b747c161db457e032a023ebbff511f5de5ec2 (diff) | |
| parent | 7aa3e313a363049bef4a75ad9c75b1dd2adfc3de (diff) | |
| download | luajit-652f71bb1d0b540647c7fee42a312ceb808f9cf3.tar.gz luajit-652f71bb1d0b540647c7fee42a312ceb808f9cf3.tar.bz2 luajit-652f71bb1d0b540647c7fee42a312ceb808f9cf3.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/dump.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index d3425bda..f97aa6ed 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -584,7 +584,7 @@ local function dump_trace(what, tr, func, pc, otr, oex) | |||
| 584 | end | 584 | end |
| 585 | 585 | ||
| 586 | -- Dump recorded bytecode. | 586 | -- Dump recorded bytecode. |
| 587 | local function dump_record(tr, func, pc, depth, callee) | 587 | local function dump_record(tr, func, pc, depth) |
| 588 | if depth ~= recdepth then | 588 | if depth ~= recdepth then |
| 589 | recdepth = depth | 589 | recdepth = depth |
| 590 | recprefix = rep(" .", depth) | 590 | recprefix = rep(" .", depth) |
| @@ -595,7 +595,6 @@ local function dump_record(tr, func, pc, depth, callee) | |||
| 595 | if dumpmode.H then line = gsub(line, "[<>&]", html_escape) end | 595 | if dumpmode.H then line = gsub(line, "[<>&]", html_escape) end |
| 596 | else | 596 | else |
| 597 | line = "0000 "..recprefix.." FUNCC \n" | 597 | line = "0000 "..recprefix.." FUNCC \n" |
| 598 | callee = func | ||
| 599 | end | 598 | end |
| 600 | if pc <= 0 then | 599 | if pc <= 0 then |
| 601 | out:write(sub(line, 1, -2), " ; ", fmtfunc(func), "\n") | 600 | out:write(sub(line, 1, -2), " ; ", fmtfunc(func), "\n") |