Index: runtime/vm/stack_frame.cc |
diff --git a/runtime/vm/stack_frame.cc b/runtime/vm/stack_frame.cc |
index bf5a05d4bdf51e2896b2415bbeaab9117691771e..e371be58ab693b095da32c28d10fddde20b2f3e0 100644 |
--- a/runtime/vm/stack_frame.cc |
+++ b/runtime/vm/stack_frame.cc |
@@ -22,9 +22,7 @@ namespace dart { |
bool StackFrame::IsStubFrame() const { |
ASSERT(!(IsEntryFrame() || IsExitFrame())); |
- uword saved_pc = |
- *(reinterpret_cast<uword*>(fp() + (kPcMarkerSlotFromFp * kWordSize))); |
- return (saved_pc == 0); |
+ return (LookupDartCode() == Code::null()); |
} |
@@ -175,8 +173,11 @@ RawCode* StackFrame::LookupDartCode() const { |
// that the code is called while a GC is in progress, that is ok. |
NoSafepointScope no_safepoint; |
RawCode* code = GetCodeObject(); |
- ASSERT(code == Code::null() || code->ptr()->owner_ != Function::null()); |
- return code; |
+ if ((code != Code::null()) && |
+ (code->ptr()->owner_->GetClassId() == kFunctionCid)) { |
+ return code; |
+ } |
+ return Code::null(); |
} |
@@ -188,12 +189,8 @@ RawCode* StackFrame::GetCodeObject() const { |
const uword pc_marker = |
*(reinterpret_cast<uword*>(fp() + (kPcMarkerSlotFromFp * kWordSize))); |
if (pc_marker != 0) { |
- const uword entry_point = |
- (pc_marker - Assembler::EntryPointToPcMarkerOffset()); |
- RawInstructions* instr = Instructions::FromEntryPoint(entry_point); |
- if (instr != Instructions::null()) { |
- return instr->ptr()->code_; |
- } |
+ ASSERT(reinterpret_cast<RawObject*>(pc_marker)->GetClassId() == kCodeCid); |
+ return reinterpret_cast<RawCode*>(pc_marker); |
} |
return Code::null(); |
} |