- Use a map to lookup libraries by URL.

runtime/vm/code_generator_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/ast.h"
 #include "vm/assembler.h"
@@ skipping 195 matching lines @@
   SequenceNode* node_seq = test->node_sequence();
   LiteralNode* a =
       new LiteralNode(kPos, Double::ZoneHandle(Double::New(12.0, Heap::kOld)));
   UnaryOpNode* neg_node = new UnaryOpNode(kPos, Token::kNEGATE, a);
   node_seq->Add(new ReturnNode(kPos, neg_node));
 }
 CODEGEN_TEST_RUN(DoubleUnaryOpCodegen, Double::New(-12.0))
 
 
 static Library& MakeTestLibrary(const char* url) {
-  const String& lib_url = String::ZoneHandle(Symbols::New(Thread::Current(),
-                                                          url));
-  Library& lib = Library::ZoneHandle(Library::New(lib_url));
-  lib.Register();
-  Library& core_lib = Library::Handle(Library::CoreLibrary());
+  Thread* thread = Thread::Current();
+  Zone* zone = thread->zone();
+
+  const String& lib_url = String::ZoneHandle(zone, Symbols::New(thread, url));
+  Library& lib = Library::ZoneHandle(zone, Library::New(lib_url));
+  lib.Register(thread);
+  Library& core_lib = Library::Handle(zone, Library::CoreLibrary());
   ASSERT(!core_lib.IsNull());
-  const Namespace& core_ns = Namespace::Handle(
-      Namespace::New(core_lib, Array::Handle(), Array::Handle()));
+  const Namespace& core_ns = Namespace::Handle(zone,
+      Namespace::New(core_lib, Array::Handle(zone), Array::Handle(zone)));
   lib.AddImport(core_ns);
   return lib;
 }
 
 
 static RawClass* LookupClass(const Library& lib, const char* name) {
   const String& cls_name = String::ZoneHandle(Symbols::New(Thread::Current(),
                                                            name));
   return lib.LookupClass(cls_name);
 }
@@ skipping 129 matching lines @@
   Library& app_lib = Library::Handle();
   app_lib ^= libs.At(num_libs - 1);
   ASSERT(!app_lib.IsNull());
   const Class& cls = Class::Handle(
       app_lib.LookupClass(String::Handle(Symbols::New(Thread::Current(),
                                                       "A"))));
   EXPECT_EQ(cls.raw(), result.clazz());
 }
 
 }  // namespace dart