Index: runtime/vm/bootstrap_natives.cc |
diff --git a/runtime/vm/bootstrap_natives.cc b/runtime/vm/bootstrap_natives.cc |
index 2c0d9175ce61d114e86be30aea25fa2ba18a1e73..1fefbd8974490aa214adb1bc120297aaa8f251ab 100644 |
--- a/runtime/vm/bootstrap_natives.cc |
+++ b/runtime/vm/bootstrap_natives.cc |
@@ -51,11 +51,20 @@ static Dart_NativeFunction NativeLookup(Dart_Handle name, |
void Bootstrap::SetupNativeResolver() { |
- Library& library = Library::Handle(Library::CoreLibrary()); |
+ Isolate* isolate = Isolate::Current(); |
+ Library& library = Library::Handle(); |
+ |
+ library = isolate->object_store()->core_library(); |
Ivan Posva
2012/02/25 00:14:38
Why were these changes here needed?
Siggi Cherem (dart-lang)
2012/02/25 02:10:38
Reverted. I was integrating the changes from Todd
|
+ ASSERT(!library.IsNull()); |
+ library.set_native_entry_resolver( |
+ reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |
+ |
+ library = isolate->object_store()->core_impl_library(); |
ASSERT(!library.IsNull()); |
library.set_native_entry_resolver( |
reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |
- library = Library::CoreImplLibrary(); |
+ |
+ library = isolate->object_store()->isolate_library(); |
ASSERT(!library.IsNull()); |
library.set_native_entry_resolver( |
reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |