Eliminate imported_into pointers in Library

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2045 matching lines @@
 
   void Register() const;
 
   bool IsDebuggable() const {
     return raw_ptr()->debuggable_;
   }
   void set_debuggable(bool value) const {
     raw_ptr()->debuggable_ = value;
   }
 
-  RawString* DuplicateDefineErrorString(const String& entry_name,
-                                        const Library& conflicting_lib) const;
   static RawLibrary* LookupLibrary(const String& url);
   static RawLibrary* GetLibrary(intptr_t index);
-  static RawString* CheckForDuplicateDefinition();
   static bool IsKeyUsed(intptr_t key);
 
   static void InitCoreLibrary(Isolate* isolate);
   static void InitMathLibrary(Isolate* isolate);
   static void InitIsolateLibrary(Isolate* isolate);
   static void InitMirrorsLibrary(Isolate* isolate);
   static RawLibrary* CoreLibrary();
   static RawLibrary* CoreImplLibrary();
   static RawLibrary* MathLibrary();
   static RawLibrary* IsolateLibrary();
   static RawLibrary* MirrorsLibrary();
   static void InitNativeWrappersLibrary(Isolate* isolate);
   static RawLibrary* NativeWrappersLibrary();
 
   // Eagerly compile all classes and functions in the library.
   static RawError* CompileAll();
 
  private:
   static const int kInitialImportsCapacity = 4;
   static const int kImportsCapacityIncrement = 8;
-  static const int kInitialImportedIntoCapacity = 1;
-  static const int kImportedIntoCapacityIncrement = 2;
   static RawLibrary* New();
 
   void set_num_imports(intptr_t value) const {
     raw_ptr()->num_imports_ = value;
   }
-  intptr_t num_imported_into() const { return raw_ptr()->num_imported_into_; }
-  void set_num_imported_into(intptr_t value) const {
-    raw_ptr()->num_imported_into_ = value;
-  }
   RawArray* imports() const { return raw_ptr()->imports_; }
-  RawArray* imported_into() const { return raw_ptr()->imported_into_; }
   RawArray* loaded_scripts() const { return raw_ptr()->loaded_scripts_; }
   RawArray* dictionary() const { return raw_ptr()->dictionary_; }
   void InitClassDictionary() const;
   void InitImportList() const;
-  void InitImportedIntoList() const;
   void GrowDictionary(const Array& dict, intptr_t dict_size) const;
   static RawLibrary* NewLibraryHelper(const String& url,
                                       bool import_core_lib);
-  void AddImportedInto(const Library& library) const;
   RawObject* LookupEntry(const String& name, intptr_t *index) const;
-  RawObject* LookupObjectFiltered(const String& name,
-                                  const Library& filter_lib) const;
-  RawLibrary* LookupObjectInImporter(const String& name) const;
-  RawString* FindDuplicateDefinition() const;
 
   HEAP_OBJECT_IMPLEMENTATION(Library, Object);
   friend class Class;
   friend class Debugger;
   friend class DictionaryIterator;
   friend class Isolate;
 };
 
 
 class LibraryPrefix : public Object {
  public:
   RawString* name() const { return raw_ptr()->name_; }
   RawArray* libraries() const { return raw_ptr()->libraries_; }
   intptr_t num_libs() const { return raw_ptr()->num_libs_; }
 
   bool ContainsLibrary(const Library& library) const;
   RawLibrary* GetLibrary(int index) const;
   void AddLibrary(const Library& library) const;
   RawClass* LookupLocalClass(const String& class_name) const;
-  RawString* CheckForDuplicateDefinition() const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawLibraryPrefix));
   }
 
   static RawLibraryPrefix* New(const String& name, const Library& lib);
 
  private:
   static const int kInitialSize = 2;
   static const int kIncrementSize = 2;
@@ skipping 3402 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_