Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1311)

Unified Diff: runtime/vm/stack_frame.cc

Issue 1192103004: VM: New calling convention for generated code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: preserve CODE_REG in ARM Integer_shl intrinsic. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/stack_frame.cc
diff --git a/runtime/vm/stack_frame.cc b/runtime/vm/stack_frame.cc
index bf5a05d4bdf51e2896b2415bbeaab9117691771e..c0fe354839bfcf4e5b90169692ccb3b0508a9dd4 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();
}
@@ -187,15 +188,10 @@ RawCode* StackFrame::GetCodeObject() const {
NoSafepointScope no_safepoint;
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_;
- }
- }
- return Code::null();
+ ASSERT(pc_marker != 0);
+ ASSERT(reinterpret_cast<RawObject*>(pc_marker)->GetClassId() == kCodeCid ||
+ reinterpret_cast<RawObject*>(pc_marker) == Object::null());
+ return reinterpret_cast<RawCode*>(pc_marker);
}

Powered by Google App Engine
This is Rietveld 408576698