Index: runtime/vm/raw_object.cc |
diff --git a/runtime/vm/raw_object.cc b/runtime/vm/raw_object.cc |
index 67f0afc13733f31483bd1737916cfa10678c363d..11c21557492c6aca3911335a4348f05ff542ab86 100644 |
--- a/runtime/vm/raw_object.cc |
+++ b/runtime/vm/raw_object.cc |
@@ -444,9 +444,9 @@ intptr_t RawFunction::VisitFunctionPointers(RawFunction* raw_obj, |
} |
visitor->VisitPointers(raw_obj->from(), raw_obj->to_no_code()); |
- if (ShouldVisitCode(raw_obj->ptr()->instructions_->ptr()->code_)) { |
+ if (ShouldVisitCode(raw_obj->ptr()->code_)) { |
visitor->VisitPointer( |
- reinterpret_cast<RawObject**>(&raw_obj->ptr()->instructions_)); |
+ reinterpret_cast<RawObject**>(&raw_obj->ptr()->code_)); |
} else { |
visitor->skipped_code_functions()->Add(raw_obj); |
} |
@@ -510,6 +510,16 @@ intptr_t RawNamespace::VisitNamespacePointers( |
} |
+bool RawCode::ContainsPC(RawObject* raw_obj, uword pc) { |
+ uword tags = raw_obj->ptr()->tags_; |
+ if (RawObject::ClassIdTag::decode(tags) == kCodeCid) { |
+ RawCode* raw_code = reinterpret_cast<RawCode*>(raw_obj); |
+ return RawInstructions::ContainsPC(raw_code->ptr()->instructions_, pc); |
+ } |
+ return false; |
+} |
+ |
+ |
intptr_t RawCode::VisitCodePointers(RawCode* raw_obj, |
ObjectPointerVisitor* visitor) { |
visitor->VisitPointers(raw_obj->from(), raw_obj->to()); |
@@ -551,7 +561,6 @@ intptr_t RawObjectPool::VisitObjectPoolPointers( |
intptr_t RawInstructions::VisitInstructionsPointers( |
RawInstructions* raw_obj, ObjectPointerVisitor* visitor) { |
RawInstructions* obj = raw_obj->ptr(); |
- visitor->VisitPointers(raw_obj->from(), raw_obj->to()); |
return Instructions::InstanceSize(obj->size_); |
} |