Index: runtime/vm/object.cc |
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
index 6a691df0330e2a85f4138ba913d3fef95c9004f3..ee9c32561cf7bd3859381976ec1227266c903eec 100644 |
--- a/runtime/vm/object.cc |
+++ b/runtime/vm/object.cc |
@@ -7311,7 +7311,7 @@ RawObject* Library::GetMetadata(const Object& obj) const { |
Field& field = Field::Handle(GetMetadataField(metaname)); |
if (field.IsNull()) { |
// There is no metadata for this object. |
- return Object::empty_array().raw();; |
+ return Object::empty_array().raw(); |
} |
Object& metadata = Object::Handle(); |
metadata = field.value(); |
@@ -9597,6 +9597,9 @@ RawCode* Code::LookupCode(uword pc) { |
NoGCScope no_gc; |
FindRawCodeVisitor visitor(pc); |
RawInstructions* instr; |
+ if (isolate->heap() == NULL) { |
+ return Code::null(); |
+ } |
instr = isolate->heap()->FindObjectInCodeSpace(&visitor); |
if (instr != Instructions::null()) { |
return instr->ptr()->code_; |