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

src/ast/modules.cc

 // 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.
 
 #include "src/ast/modules.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
 
-
 void ModuleDescriptor::AddImport(
     const AstRawString* import_name, const AstRawString* local_name,
     const AstRawString* module_request, Scanner::Location loc, Zone* zone) {
   DCHECK_NOT_NULL(import_name);
   DCHECK_NOT_NULL(local_name);
   DCHECK_NOT_NULL(module_request);
   ModuleEntry* entry = new (zone) ModuleEntry(loc);
   entry->local_name = local_name;
   entry->import_name = import_name;
   entry->module_request = module_request;
-  imports_.Add(entry, zone);
+  regular_imports_.insert(std::make_pair(entry->local_name, entry));
+  // We don't care if there's already an entry for this local name, as in that
+  // case we will report an error when declaring the variable.
 }
 
 
 void ModuleDescriptor::AddStarImport(
     const AstRawString* local_name, const AstRawString* module_request,
     Scanner::Location loc, Zone* zone) {
   DCHECK_NOT_NULL(local_name);
   DCHECK_NOT_NULL(module_request);
   ModuleEntry* entry = new (zone) ModuleEntry(loc);
   entry->local_name = local_name;
   entry->module_request = module_request;
-  imports_.Add(entry, zone);
+  special_imports_.Add(entry, zone);
 }
 
 
 void ModuleDescriptor::AddEmptyImport(
     const AstRawString* module_request, Scanner::Location loc, Zone* zone) {
   DCHECK_NOT_NULL(module_request);
   ModuleEntry* entry = new (zone) ModuleEntry(loc);
   entry->module_request = module_request;
-  imports_.Add(entry, zone);
+  special_imports_.Add(entry, zone);
 }
 
 
 void ModuleDescriptor::AddExport(
     const AstRawString* local_name, const AstRawString* export_name,
     Scanner::Location loc, Zone* zone) {
   DCHECK_NOT_NULL(local_name);
   DCHECK_NOT_NULL(export_name);
   ModuleEntry* entry = new (zone) ModuleEntry(loc);
   entry->export_name = export_name;
@@ skipping 62 matching lines @@
           MessageTemplate::kModuleExportUndefined, entry->local_name);
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace internal
 }  // namespace v8