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

src/ast/scopes.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/scopes.h"
 
 #include <set>
 
 #include "src/accessors.h"
 #include "src/bootstrapper.h"
@@ skipping 1685 matching lines @@
   if (new_target_ != nullptr && !MustAllocate(new_target_)) {
     new_target_ = nullptr;
   }
 
   if (this_function_ != nullptr && !MustAllocate(this_function_)) {
     this_function_ = nullptr;
   }
 }
 
 void DeclarationScope::AllocateModuleVariables() {
-  for (auto entry : module()->imports()) {
-    if (entry->local_name == nullptr) continue;
-    if (entry->import_name == nullptr) continue;  // Namespace import.
-    Variable* var = LookupLocal(entry->local_name);
+  for (auto it = module()->regular_imports().begin();
+       it != module()->regular_imports().end(); ++it) {
+    Variable* var = LookupLocal(it->second->local_name);
     // TODO(neis): Use a meaningful index.
     var->AllocateTo(VariableLocation::MODULE, 42);
   }
+
   for (auto entry : module()->exports()) {
     if (entry->local_name == nullptr) continue;
     Variable* var = LookupLocal(entry->local_name);
     var->AllocateTo(VariableLocation::MODULE, 42);
   }
 }
 
 void Scope::AllocateVariablesRecursively(AstValueFactory* ast_value_factory) {
   if (!already_resolved()) {
     num_stack_slots_ = 0;
@@ skipping 57 matching lines @@
       function != NULL && function->proxy()->var()->IsContextSlot();
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS - num_global_slots() -
          (is_function_var_in_context ? 1 : 0);
 }
 
 
 int Scope::ContextGlobalCount() const { return num_global_slots(); }
 
 }  // namespace internal
 }  // namespace v8