| Index: src/frames.cc
|
| diff --git a/src/frames.cc b/src/frames.cc
|
| index a8fe6bb7b61b2524c6f84313370ab665b234424e..465f0472d4ece84b835b3be688a201d610a262a0 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,13 +449,12 @@ 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()) {
|
| - return INTERPRETED;
|
| - }
|
| switch (code_obj->kind()) {
|
| case Code::BUILTIN:
|
| if (marker->IsSmi()) break;
|
| + if (code_obj->is_interpreter_trampoline_builtin()) {
|
| + return INTERPRETED;
|
| + }
|
| // We treat frames for BUILTIN Code objects as OptimizedFrame for now
|
| // (all the builtins with JavaScript linkage are actually generated
|
| // with TurboFan currently, so this is sound).
|
|
|