[modules] Split imports into regular and special, store regular ones in a map.

src/ast/modules.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_AST_MODULES_H_
 #define V8_AST_MODULES_H_
 
 #include "src/parsing/scanner.h"  // Only for Scanner::Location.
 #include "src/pending-compilation-error-handler.h"
-#include "src/zone.h"
+#include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 
 
 class AstRawString;
 
 
 class ModuleDescriptor : public ZoneObject {
  public:
   explicit ModuleDescriptor(Zone* zone)
-      : exports_(1, zone), imports_(1, zone) {}
+      : exports_(1, zone), special_imports_(1, zone), regular_imports_(zone) {}
 
   // import x from "foo.js";
   // import {x} from "foo.js";
   // import {x as y} from "foo.js";
   void AddImport(
     const AstRawString* import_name, const AstRawString* local_name,
     const AstRawString* module_request, const Scanner::Location loc,
     Zone* zone);
 
   // import * as x from "foo.js";
@@ skipping 42 matching lines @@
     const AstRawString* module_request;
 
     explicit ModuleEntry(Scanner::Location loc)
         : location(loc),
           export_name(nullptr),
           local_name(nullptr),
           import_name(nullptr),
           module_request(nullptr) {}
   };
 
-  const ZoneList<const ModuleEntry*>& exports() { return exports_; }
-  const ZoneList<const ModuleEntry*>& imports() { return imports_; }
+  const ZoneList<const ModuleEntry*>& exports() const { return exports_; }
+
+  // Empty imports and namespace imports.
+  const ZoneList<const ModuleEntry*>& special_imports() const {
+    return special_imports_;
+  }
+
+  // All the remaining imports, indexed by local name.
+  const ZoneMap<const AstRawString*, const ModuleEntry*>& regular_imports()
+      const {
+    return regular_imports_;
+  }
 
  private:
   ZoneList<const ModuleEntry*> exports_;
-  ZoneList<const ModuleEntry*> imports_;
+  ZoneList<const ModuleEntry*> special_imports_;
+  ZoneMap<const AstRawString*, const ModuleEntry*> regular_imports_;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_MODULES_H_