Index: src/frames.cc |
diff --git a/src/frames.cc b/src/frames.cc |
index fc26168114d540eda866c6872485f28bdc245cc0..e25bd30fc7412e2676b9489e7a753c09f4123aaa 100644 |
--- a/src/frames.cc |
+++ b/src/frames.cc |
@@ -400,11 +400,15 @@ static bool IsInterpreterFramePc(Isolate* isolate, Address pc) { |
isolate->builtins()->builtin(Builtins::kInterpreterEntryTrampoline); |
Code* interpreter_bytecode_dispatch = |
isolate->builtins()->builtin(Builtins::kInterpreterEnterBytecodeDispatch); |
+ Code* interpreter_baseline_on_return = |
+ isolate->builtins()->builtin(Builtins::kInterpreterMarkBaselineOnReturn); |
return (pc >= interpreter_entry_trampoline->instruction_start() && |
pc < interpreter_entry_trampoline->instruction_end()) || |
(pc >= interpreter_bytecode_dispatch->instruction_start() && |
- pc < interpreter_bytecode_dispatch->instruction_end()); |
+ pc < interpreter_bytecode_dispatch->instruction_end()) || |
+ (pc >= interpreter_baseline_on_return->instruction_start() && |
+ pc < interpreter_baseline_on_return->instruction_end()); |
} |
StackFrame::Type StackFrame::ComputeType(const StackFrameIteratorBase* iterator, |
@@ -445,8 +449,7 @@ StackFrame::Type StackFrame::ComputeType(const StackFrameIteratorBase* iterator, |
Code* code_obj = |
GetContainingCode(iterator->isolate(), *(state->pc_address)); |
if (code_obj != nullptr) { |
- if (code_obj->is_interpreter_entry_trampoline() || |
- code_obj->is_interpreter_enter_bytecode_dispatch()) { |
+ if (code_obj->is_interpreter_trampoline_builtin()) { |
return INTERPRETED; |
} |
switch (code_obj->kind()) { |