[modules] Assign cell indices at validation time.

src/ast/scopeinfo.cc

 // Copyright 2011 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 <stdlib.h>
 
 #include "src/ast/context-slot-cache.h"
 #include "src/ast/scopes.h"
 #include "src/ast/variables.h"
 #include "src/bootstrapper.h"
@@ skipping 636 matching lines @@
   int entry = ModuleVariablesIndex();
   for (int i = 0; i < module_vars_count; ++i) {
     if (*name == get(entry + kModuleVariableNameOffset)) {
       int index;
       ModuleVariable(i, nullptr, &index, mode, init_flag, maybe_assigned_flag);
       return index;
     }
     entry += kModuleVariableEntryLength;
   }
 
-  return -1;
+  return 0;
 }
 
 int ScopeInfo::ContextSlotIndex(Handle<ScopeInfo> scope_info,
                                 Handle<String> name, VariableMode* mode,
                                 InitializationFlag* init_flag,
                                 MaybeAssignedFlag* maybe_assigned_flag) {
   DCHECK(name->IsInternalizedString());
   DCHECK_NOT_NULL(mode);
   DCHECK_NOT_NULL(init_flag);
   DCHECK_NOT_NULL(maybe_assigned_flag);
@@ skipping 131 matching lines @@
 
   int entry = ModuleVariablesIndex() + i * kModuleVariableEntryLength;
   int properties =
       Smi::cast(get(entry + kModuleVariablePropertiesOffset))->value();
 
   if (name != nullptr) {
     *name = String::cast(get(entry + kModuleVariableNameOffset));
   }
   if (index != nullptr) {
     *index = Smi::cast(get(entry + kModuleVariableIndexOffset))->value();
+    DCHECK_NE(*index, 0);
   }
   if (mode != nullptr) {
     *mode = VariableModeField::decode(properties);
   }
   if (init_flag != nullptr) {
     *init_flag = InitFlagField::decode(properties);
   }
   if (maybe_assigned_flag != nullptr) {
     *maybe_assigned_flag = MaybeAssignedFlagField::decode(properties);
   }
@@ skipping 41 matching lines @@
   }
 
   PrintF("}\n");
 }
 #endif  // DEBUG
 
 Handle<ModuleInfoEntry> ModuleInfoEntry::New(Isolate* isolate,
                                              Handle<Object> export_name,
                                              Handle<Object> local_name,
                                              Handle<Object> import_name,
-                                             Handle<Object> module_request,
+                                             int module_request, int cell_index,
                                              int beg_pos, int end_pos) {
   Handle<ModuleInfoEntry> result = isolate->factory()->NewModuleInfoEntry();
   result->set(kExportNameIndex, *export_name);
   result->set(kLocalNameIndex, *local_name);
   result->set(kImportNameIndex, *import_name);
-  result->set(kModuleRequestIndex, *module_request);
+  result->set(kModuleRequestIndex, Smi::FromInt(module_request));
+  result->set(kCellIndexIndex, Smi::FromInt(cell_index));
   result->set(kBegPosIndex, Smi::FromInt(beg_pos));
   result->set(kEndPosIndex, Smi::FromInt(end_pos));
   return result;
 }
 
 Handle<ModuleInfo> ModuleInfo::New(Isolate* isolate, Zone* zone,
                                    ModuleDescriptor* descr) {
   // Serialize module requests.
   Handle<FixedArray> module_requests = isolate->factory()->NewFixedArray(
       static_cast<int>(descr->module_requests().size()));
@@ skipping 58 matching lines @@
     if (String::cast(entry->local_name())->Equals(*local_name)) {
       return entry;
     }
   }
   UNREACHABLE();
   return Handle<ModuleInfoEntry>();
 }
 
 }  // namespace internal
 }  // namespace v8