Revert my last change.

runtime/vm/object.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 "vm/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 4571 matching lines @@
 
 void ClassDictionaryIterator::MoveToNextClass() {
   Object& obj = Object::Handle(array_.At(next_ix_));
   while (!obj.IsClass() && HasNext()) {
     next_ix_++;
     obj = array_.At(next_ix_);
   }
 }
 
 
+void Library::set_import_map(const Array& map) const {
+  StorePointer(&raw_ptr()->import_map_, map.raw());
+}
+
+
 void Library::SetName(const String& name) const {
   // Only set name once.
   ASSERT(!Loaded());
   ASSERT(name.IsSymbol());
   StorePointer(&raw_ptr()->name_, name.raw());
 }
 
 
 void Library::SetLoadInProgress() const {
   // Should not be already loaded.
@@ skipping 581 matching lines @@
     lib ^= imports.At(i);
     import_url = lib.url();
     if (url.Equals(import_url)) {
       return lib.raw();
     }
   }
   return Library::null();
 }
 
 
+RawString* Library::LookupImportMap(const String& ident) const {
+  Array& import_map = Array::Handle(this->import_map());
+  intptr_t length = import_map.Length();
+  intptr_t index = 0;
+  String& name = String::Handle();
+  while (index < (length - 1)) {
+    name ^= import_map.At(index);
+    if (name.Equals(ident)) {
+      name ^= import_map.At(index + 1);
+      return name.raw();
+    }
+    index += 2;
+  }
+  return String::null();
+}
+
+
 void Library::AddImport(const Library& library) const {
   Array& imports = Array::Handle(this->imports());
   intptr_t capacity = imports.Length();
   if (num_imports() == capacity) {
     capacity = capacity + kImportsCapacityIncrement;
     imports = Array::Grow(imports, capacity);
     StorePointer(&raw_ptr()->imports_, imports.raw());
   }
   intptr_t index = num_imports();
   imports.SetAt(index, library);
@@ skipping 55 matching lines @@
 
 RawLibrary* Library::NewLibraryHelper(const String& url,
                                       bool import_core_lib) {
   const Library& result = Library::Handle(Library::New());
   result.raw_ptr()->name_ = url.raw();
   result.raw_ptr()->url_ = url.raw();
   result.raw_ptr()->private_key_ = Scanner::AllocatePrivateKey(result);
   result.raw_ptr()->dictionary_ = Array::Empty();
   result.raw_ptr()->anonymous_classes_ = Array::Empty();
   result.raw_ptr()->num_anonymous_ = 0;
+  result.raw_ptr()->import_map_ = Array::Empty();
   result.raw_ptr()->imports_ = Array::Empty();
   result.raw_ptr()->next_registered_ = Library::null();
   result.raw_ptr()->loaded_scripts_ = Array::null();
   result.set_native_entry_resolver(NULL);
   result.raw_ptr()->corelib_imported_ = true;
   result.raw_ptr()->load_state_ = RawLibrary::kAllocated;
   result.InitClassDictionary();
   result.InitImportList();
   result.InitImportedIntoList();
   if (import_core_lib) {
@@ skipping 4698 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart