Index: runtime/vm/dart.cc |
=================================================================== |
--- runtime/vm/dart.cc (revision 41244) |
+++ runtime/vm/dart.cc (working copy) |
@@ -204,15 +204,24 @@ |
Profiler::InitProfilingForIsolate(isolate); |
if (snapshot_buffer == NULL) { |
- const Error& error = Error::Handle(Object::Init(isolate)); |
+ Error& error = Error::Handle(Object::Init(isolate)); |
if (!error.IsNull()) { |
return error.raw(); |
} |
+ |
+ StubCode::InitBootstrapStubs(isolate); |
Vyacheslav Egorov (Google)
2014/10/24 10:58:08
Why don't you move this into Object::Init?
Florian Schneider
2014/10/24 11:24:39
Done.
|
+ |
+ error = Object::FinishInit(isolate); |
+ if (!error.IsNull()) { |
+ return error.raw(); |
+ } |
} else { |
// Initialize from snapshot (this should replicate the functionality |
// of Object::Init(..) in a regular isolate creation path. |
Object::InitFromSnapshot(isolate); |
+ StubCode::InitBootstrapStubs(isolate); |
+ |
// TODO(turnidge): Remove once length is not part of the snapshot. |
const Snapshot* snapshot = Snapshot::SetupFromBuffer(snapshot_buffer); |
if (snapshot == NULL) { |