Chromium Code Reviews| Index: runtime/vm/dart.cc |
| diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc |
| index a0f8584168dfbe011c6d4cb3eb835c5d8fb3d1f3..f94ff5d8a469f8bcda8c496d717537b705c818e8 100644 |
| --- a/runtime/vm/dart.cc |
| +++ b/runtime/vm/dart.cc |
| @@ -141,6 +141,9 @@ const char* Dart::InitOnce(const uint8_t* vm_isolate_snapshot, |
| // Now that the needed stub has been generated, set the stack limit. |
| vm_isolate_->InitializeStackLimit(); |
| if (vm_isolate_snapshot != NULL) { |
| + if (instructions_snapshot != NULL) { |
| + vm_isolate_->SetupInstructionsSnapshotPage(instructions_snapshot); |
| + } |
| const Snapshot* snapshot = Snapshot::SetupFromBuffer(vm_isolate_snapshot); |
| if (snapshot == NULL) { |
| return "Invalid vm isolate snapshot seen."; |
| @@ -305,13 +308,18 @@ RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) { |
| } |
| Object::VerifyBuiltinVtables(); |
| +#if defined(DEBUG) |
| + I->heap()->Verify(kForbidMarked); |
| +#endif |
| { |
| TimelineDurationScope tds(I, I->GetIsolateStream(), "StubCode::Init"); |
| StubCode::Init(I); |
| } |
| - I->megamorphic_cache_table()->InitMissHandler(); |
| + if (Object::instructions_snapshot_buffer() == NULL) { |
|
siva
2015/09/14 21:29:33
maybe we should have a readable accessor, somethin
rmacnak
2015/09/15 20:07:45
Done.
|
| + I->megamorphic_cache_table()->InitMissHandler(); |
| + } |
| if (snapshot_buffer == NULL) { |
| if (!I->object_store()->PreallocateObjects()) { |
| return I->object_store()->sticky_error(); |