| Index: runtime/vm/object.cc
|
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
|
| index ebece8a43d8a8aa9d856d7cc0d167961eb00332d..37a1ede809f2eb27d14795125928e8ab925d1df8 100644
|
| --- a/runtime/vm/object.cc
|
| +++ b/runtime/vm/object.cc
|
| @@ -7296,7 +7296,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();
|
| @@ -9582,6 +9582,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_;
|
|
|