[modules] Assign cell indices at validation time.

src/debug/debug-scopes.cc

Index: src/debug/debug-scopes.cc
diff --git a/src/debug/debug-scopes.cc b/src/debug/debug-scopes.cc
index be23e8a3e2ca263df60c0e44b42a5bb0f369739d..b0b6194d6acb69f2d5a668b59d6736b1491f7084 100644
--- a/src/debug/debug-scopes.cc
+++ b/src/debug/debug-scopes.cc
@@ -801,7 +801,8 @@ void ScopeIterator::CopyModuleVarsToScopeObject(Handle<ScopeInfo> scope_info,
       scope_info->ModuleVariable(i, &name, &index);
       CHECK(!ScopeInfo::VariableIsSynthetic(name));
       local_name = handle(name, isolate);
-      is_export = index == Variable::kModuleExportIndex;
+      DCHECK_NE(index, 0);
+      is_export = index > 0;

[adamk, 2016/10/31 18:25:04]

Comparisons like these getting added in various places also worry me. Perhaps
there's some way to encapsulate more of this logic? Not sure if that would be in
ModuleDescriptor or Variable. But It seems really fragile to have to have all
these magic zeros and >, < operators around (too easy to get one wrong and have
it slip through review).

[neis, 2016/11/03 10:43:48]

It's already in Variable (IsExport), but here we don't have a Variable. 
Fortunately, this one will go away in a followup change that replaces LoadImport
and LoadExport with a single LoadVariable.

     }
 
     Handle<Object> value;
@@ -814,9 +815,8 @@ void ScopeIterator::CopyModuleVarsToScopeObject(Handle<ScopeInfo> scope_info,
       Handle<ModuleInfoEntry> entry =
           ModuleInfo::LookupRegularImport(module_info, local_name);
       Handle<String> import_name(String::cast(entry->import_name()), isolate);
-      int module_request = Smi::cast(entry->module_request())->value();
       value = Module::LoadImport(handle(context->module(), isolate),
-                                 import_name, module_request);
+                                 import_name, entry->module_request());
     }
 
     // Reflect variables under TDZ as undefined in scope object.