[modules] Make handling of module info's regular exports more robust.

src/objects.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/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <memory>
 #include <sstream>
@@ skipping 19993 matching lines @@
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           shared,
           handle(Utils::OpenHandle(*context)->native_context(), isolate));
   module->set_code(*function);
   DCHECK(module->instantiated());
 
   Handle<ModuleInfo> module_info(shared->scope_info()->ModuleDescriptorInfo(),
                                  isolate);
 
   // Set up local exports.
-  Handle<FixedArray> regular_exports(module_info->regular_exports(), isolate);
-  for (int i = 0, n = regular_exports->length(); i < n; i += 3) {
-    // TODO(neis): Make this more robust.
-    Handle<FixedArray> export_names(
-        FixedArray::cast(regular_exports->get(i + 2)), isolate);
+  for (int i = 0, n = module_info->RegularExportCount(); i < n; ++i) {
+    Handle<FixedArray> export_names(module_info->RegularExportExportNames(i),
+                                    isolate);
     CreateExport(module, export_names);
   }
 
   // Partially set up indirect exports.
   // For each indirect export, we create the appropriate slot in the export
   // table and store its ModuleInfoEntry there.  When we later find the correct
   // Cell in the module that actually provides the value, we replace the
   // ModuleInfoEntry by that Cell (see ResolveExport).
   Handle<FixedArray> special_exports(module_info->special_exports(), isolate);
   for (int i = 0, n = special_exports->length(); i < n; ++i) {
@@ skipping 226 matching lines @@
         ns, Accessors::ModuleNamespaceEntryInfo(isolate, name, attr))
         .Check();
   }
   JSObject::PreventExtensions(ns, THROW_ON_ERROR).ToChecked();
 
   return ns;
 }
 
 }  // namespace internal
 }  // namespace v8