Chromium Code Reviews| Index: runtime/vm/object.cc |
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc |
| index 3f587bea776306c4b3259c154970d841c4fd7f15..d6c9a93938a85e63f2b43dc61794138b7ad6ebfb 100644 |
| --- a/runtime/vm/object.cc |
| +++ b/runtime/vm/object.cc |
| @@ -657,6 +657,15 @@ RawError* Object::Init(Isolate* isolate) { |
| return error.raw(); |
| } |
| + // Load other libraries, such as dart:isolate. |
| + error = Bootstrap::InitAdditionalLibraries(); |
| + if (!error.IsNull()) { |
| + return error.raw(); |
| + } |
| + |
| + Library& isolate_lib = Library::Handle(Library::IsolateLibrary()); |
| + ASSERT(!isolate_lib.IsNull()); |
|
siva
2012/02/22 00:58:20
I noticed that these changes are similar to the on
Siggi Cherem (dart-lang)
2012/02/22 19:18:50
I'm happy to do so, but since Todd is on vacation,
siva
2012/02/22 23:18:14
I think we should probably have Todd reconcile whe
|
| + |
| Bootstrap::SetupNativeResolver(); |
| // Remove the Object superclass cycle by setting the super type to null (not |
| @@ -4728,6 +4737,11 @@ RawLibrary* Library::CoreImplLibrary() { |
| } |
| +RawLibrary* Library::IsolateLibrary() { |
| + return Isolate::Current()->object_store()->isolate_library(); |
| +} |
| + |
| + |
| RawLibrary* Library::NativeWrappersLibrary() { |
| return Isolate::Current()->object_store()->native_wrappers_library(); |
| } |