Commit 5660759
deps: cherry-pick 9a23bdd from upstream V8
Original commit message:
[Isolate] Fix Isolate::PrintCurrentStackTrace for interpreted frames
Previously we were getting the code object from the stack, so printed incorrect
position details for interpreted frames.
BUG=v8:7916
Change-Id: I2f87584117d88b7db3f3b9bdbfe793c4d3e33fe9
Reviewed-on: https://chromium-review.googlesource.com/1126313
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54253}
Refs: v8/v8@9a23bdd
Refs: #21988
PR-URL: #22910
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 8ffcb2d commit 5660759
2 files changed
Lines changed: 12 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | 30 | # Reset this number to 0 on major V8 upgrades. | |
| 31 | 31 | # Increment by one for each non-official patch applied to deps/v8. | |
| 32 | - 'v8_embedder_string': '-node.27', | ||
| 32 | + 'v8_embedder_string': '-node.28', | ||
| 33 | 33 | ||
| 34 | 34 | # Enable disassembler for `--print-code` v8 options | |
| 35 | 35 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1661,8 +1661,17 @@ void Isolate::PrintCurrentStackTrace(FILE* out) { | |||
| 1661 | 1661 | ||
| 1662 | 1662 | Handle<Object> receiver(frame->receiver(), this); | |
| 1663 | 1663 | Handle<JSFunction> function(frame->function(), this); | |
| 1664 | - Handle<AbstractCode> code(AbstractCode::cast(frame->LookupCode()), this); | ||
| 1665 | - const int offset = static_cast<int>(frame->pc() - code->InstructionStart()); | ||
| 1664 | + Handle<AbstractCode> code; | ||
| 1665 | + int offset; | ||
| 1666 | + if (frame->is_interpreted()) { | ||
| 1667 | + InterpretedFrame* interpreted_frame = InterpretedFrame::cast(frame); | ||
| 1668 | + code = handle(AbstractCode::cast(interpreted_frame->GetBytecodeArray()), | ||
| 1669 | + this); | ||
| 1670 | + offset = interpreted_frame->GetBytecodeOffset(); | ||
| 1671 | + } else { | ||
| 1672 | + code = handle(AbstractCode::cast(frame->LookupCode()), this); | ||
| 1673 | + offset = static_cast<int>(frame->pc() - code->InstructionStart()); | ||
| 1674 | + } | ||
| 1666 | 1675 | ||
| 1667 | 1676 | JSStackFrame site(this, receiver, function, code, offset); | |
| 1668 | 1677 | Handle<String> line = site.ToString().ToHandleChecked(); | |
0 commit comments