| Index: runtime/vm/object.cc
|
| diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
|
| index 90b682dedd571efcae7b01dc724b10bbe5aece0d..50ab2569792a1d30d2d5db4efa228b6a7d1e5d08 100644
|
| --- a/runtime/vm/object.cc
|
| +++ b/runtime/vm/object.cc
|
| @@ -6100,16 +6100,16 @@ void Library::InitCoreLibrary(Isolate* isolate) {
|
| const Library& math_lib = Library::Handle(Library::MathLibrary());
|
| const Namespace& math_ns = Namespace::Handle(
|
| Namespace::New(math_lib, Array::Handle(), Array::Handle()));
|
| - Library::InitCollectionLibrary(isolate);
|
| - const Library& collection_lib =
|
| - Library::Handle(Library::CollectionLibrary());
|
| - const Namespace& collection_ns = Namespace::Handle(
|
| - Namespace::New(collection_lib, Array::Handle(), Array::Handle()));
|
| Library::InitCollectionDevLibrary(isolate);
|
| const Library& collection_dev_lib =
|
| Library::Handle(Library::CollectionDevLibrary());
|
| const Namespace& collection_dev_ns = Namespace::Handle(
|
| Namespace::New(collection_dev_lib, Array::Handle(), Array::Handle()));
|
| + Library::InitCollectionLibrary(isolate);
|
| + const Library& collection_lib =
|
| + Library::Handle(Library::CollectionLibrary());
|
| + const Namespace& collection_ns = Namespace::Handle(
|
| + Namespace::New(collection_lib, Array::Handle(), Array::Handle()));
|
| core_lib.AddImport(math_ns);
|
| core_lib.AddImport(collection_ns);
|
| core_lib.AddImport(collection_dev_ns);
|
| @@ -6130,7 +6130,12 @@ void Library::InitCollectionLibrary(Isolate* isolate) {
|
| const Library& math_lib = Library::Handle(Library::MathLibrary());
|
| const Namespace& math_ns = Namespace::Handle(
|
| Namespace::New(math_lib, Array::Handle(), Array::Handle()));
|
| + const Library& collection_dev_lib =
|
| + Library::Handle(Library::CollectionDevLibrary());
|
| + const Namespace& collection_dev_ns = Namespace::Handle(
|
| + Namespace::New(collection_dev_lib, Array::Handle(), Array::Handle()));
|
| lib.AddImport(math_ns);
|
| + lib.AddImport(collection_dev_ns);
|
| isolate->object_store()->set_collection_library(lib);
|
| }
|
|
|
|
|