[modules] Maintain array of cells for imports and local exports.

src/interpreter/bytecode-generator.cc

 // Copyright 2015 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/interpreter/bytecode-generator.h"
 
 #include "src/ast/compile-time-value.h"
 #include "src/ast/scopes.h"
 #include "src/code-stubs.h"
 #include "src/compilation-info.h"
@@ skipping 1847 matching lines @@
           builder()->LoadLookupGlobalSlot(variable->name(), typeof_mode,
                                           feedback_index(slot), depth);
           break;
         }
         default:
           builder()->LoadLookupSlot(variable->name(), typeof_mode);
       }
       break;
     }
     case VariableLocation::MODULE: {
-      ModuleDescriptor* descriptor = scope()->GetModuleScope()->module();
-      if (variable->IsExport()) {
-        auto it = descriptor->regular_exports().find(variable->raw_name());
-        DCHECK(it != descriptor->regular_exports().end());
-        Register export_name = register_allocator()->NewRegister();
-        builder()
-            ->LoadLiteral(it->second->export_name->string())
-            .StoreAccumulatorInRegister(export_name)
-            .CallRuntime(Runtime::kLoadModuleExport, export_name);
-      } else {
-        auto it = descriptor->regular_imports().find(variable->raw_name());
-        DCHECK(it != descriptor->regular_imports().end());
-        RegisterList args = register_allocator()->NewRegisterList(2);
-        builder()
-            ->LoadLiteral(it->second->import_name->string())
-            .StoreAccumulatorInRegister(args[0])
-            .LoadLiteral(Smi::FromInt(it->second->module_request))
-            .StoreAccumulatorInRegister(args[1])
-            .CallRuntime(Runtime::kLoadModuleImport, args);
-      }
+      Register index = register_allocator()->NewRegister();
+      builder()
+          ->LoadLiteral(Smi::FromInt(variable->index()))
+          .StoreAccumulatorInRegister(index)
+          .CallRuntime(Runtime::kLoadModuleVariable, index);
       if (hole_check_mode == HoleCheckMode::kRequired) {
         BuildThrowIfHole(variable->name());
       }
       break;
     }
   }
 }
 
 void BytecodeGenerator::BuildVariableLoadForAccumulatorValue(
     Variable* variable, FeedbackVectorSlot slot, HoleCheckMode hole_check_mode,
@@ skipping 147 matching lines @@
       if (mode == CONST && op != Token::INIT) {
         builder()->CallRuntime(Runtime::kThrowConstAssignError);
         break;
       }
 
       // If we don't throw above, we know that we're dealing with an
       // export because imports are const and we do not generate initializing
       // assignments for them.
       DCHECK(variable->IsExport());
 
-      ModuleDescriptor* mod = scope()->GetModuleScope()->module();
-      // There may be several export names for this local name, but it doesn't
-      // matter which one we pick, as they all map to the same cell.
-      auto it = mod->regular_exports().find(variable->raw_name());
-      DCHECK(it != mod->regular_exports().end());
-
       RegisterList args = register_allocator()->NewRegisterList(2);
       builder()
           ->StoreAccumulatorInRegister(args[1])
-          .LoadLiteral(it->second->export_name->string())
+          .LoadLiteral(Smi::FromInt(variable->index()))
           .StoreAccumulatorInRegister(args[0]);
       if (hole_check_mode == HoleCheckMode::kRequired) {
-        builder()->CallRuntime(Runtime::kLoadModuleExport, args[0]);
+        builder()->CallRuntime(Runtime::kLoadModuleVariable, args[0]);
         BuildHoleCheckForVariableAssignment(variable, op);
       }
       builder()
-          ->CallRuntime(Runtime::kStoreModuleExport, args)
+          ->CallRuntime(Runtime::kStoreModuleVariable, args)
           .LoadAccumulatorWithRegister(args[1]);
       break;
     }
   }
 }
 
 void BytecodeGenerator::VisitAssignment(Assignment* expr) {
   DCHECK(expr->target()->IsValidReferenceExpressionOrThis());
   Register object, key;
   RegisterList super_property_args;
@@ skipping 1134 matching lines @@
 }
 
 Runtime::FunctionId BytecodeGenerator::StoreKeyedToSuperRuntimeId() {
   return is_strict(language_mode()) ? Runtime::kStoreKeyedToSuper_Strict
                                     : Runtime::kStoreKeyedToSuper_Sloppy;
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8