[modules] Do basic linking.

src/api.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/api.h"
 
 #include <string.h>  // For memcpy, strlen.
 #ifdef V8_USE_ADDRESS_SANITIZER
 #include <sanitizer/asan_interface.h>
 #endif  // V8_USE_ADDRESS_SANITIZER
@@ skipping 1874 matching lines @@
 
 
 Local<UnboundScript> Script::GetUnboundScript() {
   i::Handle<i::Object> obj = Utils::OpenHandle(this);
   return ToApiHandle<UnboundScript>(
       i::Handle<i::SharedFunctionInfo>(i::JSFunction::cast(*obj)->shared()));
 }
 
 int Module::GetModuleRequestsLength() const {
   i::Handle<i::Module> self = Utils::OpenHandle(this);
-  i::Isolate* isolate = self->GetIsolate();
-  i::Handle<i::SharedFunctionInfo> shared;
-  if (self->code()->IsSharedFunctionInfo()) {
-    shared = i::handle(i::SharedFunctionInfo::cast(self->code()), isolate);
-  } else {
-    shared = i::handle(i::JSFunction::cast(self->code())->shared(), isolate);
-  }
-  return shared->scope_info()
-      ->ModuleDescriptorInfo()
-      ->module_requests()
-      ->length();
+  return self->info()->module_requests()->length();
 }
 
 Local<String> Module::GetModuleRequest(int i) const {
   CHECK_GE(i, 0);
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
-  i::Handle<i::SharedFunctionInfo> shared;
-  if (self->code()->IsSharedFunctionInfo()) {
-    shared = i::handle(i::SharedFunctionInfo::cast(self->code()), isolate);
-  } else {
-    shared = i::handle(i::JSFunction::cast(self->code())->shared(), isolate);
-  }
-  i::Handle<i::FixedArray> module_requests(
-      shared->scope_info()->ModuleDescriptorInfo()->module_requests(), isolate);
+  i::Handle<i::FixedArray> module_requests(self->info()->module_requests(),
+                                           isolate);
   CHECK_LT(i, module_requests->length());
   return ToApiHandle<String>(i::handle(module_requests->get(i), isolate));
 }
 
 void Module::SetEmbedderData(Local<Value> data) {
   Utils::OpenHandle(this)->set_embedder_data(*Utils::OpenHandle(*data));
 }
 
 Local<Value> Module::GetEmbedderData() const {
   auto self = Utils::OpenHandle(this);
@@ skipping 13 matching lines @@
   if (module->code()->IsJSFunction()) return true;
 
   i::Handle<i::SharedFunctionInfo> shared(
       i::SharedFunctionInfo::cast(module->code()), isolate);
   i::Handle<i::Context> context = Utils::OpenHandle(*v8_context);
   i::Handle<i::JSFunction> function =
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           shared, handle(context->native_context(), isolate));
   module->set_code(*function);
 
-  for (int i = 0, length = v8_module->GetModuleRequestsLength(); i < length;
-       ++i) {
-    Local<Module> import;
-    // TODO(adamk): Revisit these failure cases once d8 knows how to
-    // persist a module_map across multiple top-level module loads, as
-    // the current module is left in a "half-instantiated" state.
-    if (!callback(v8_context, v8_module->GetModuleRequest(i), v8_module,
-                  callback_data)
-             .ToLocal(&import)) {
-      // TODO(adamk): Give this a better error message. But this is a
-      // misuse of the API anyway.
-      isolate->ThrowIllegalOperation();
-      return false;
-    }
-    if (!InstantiateModule(import, v8_context, callback, callback_data)) {
-      return false;
-    }
-    module->requested_modules()->set(i, *Utils::OpenHandle(*import));
-  }
+  i::Handle<i::FixedArray> regular_exports = i::handle(
+      shared->scope_info()->ModuleDescriptorInfo()->regular_exports(), isolate);
+  i::Handle<i::FixedArray> regular_imports = i::handle(
+      shared->scope_info()->ModuleDescriptorInfo()->regular_imports(), isolate);
+  i::Handle<i::FixedArray> special_exports = i::handle(
+      shared->scope_info()->ModuleDescriptorInfo()->special_exports(), isolate);
 
   // Set up local exports.
-  i::Handle<i::FixedArray> regular_exports = i::handle(
-      shared->scope_info()->ModuleDescriptorInfo()->regular_exports(), isolate);
   for (int i = 0, n = regular_exports->length(); i < n; i += 2) {
     i::Handle<i::FixedArray> export_names(
         i::FixedArray::cast(regular_exports->get(i + 1)), isolate);
     i::Module::CreateExport(module, export_names);
   }
 
+  // Partially set up indirect exports.
+  for (int i = 0, n = special_exports->length(); i < n; ++i) {
+    i::Handle<i::ModuleInfoEntry> entry(
+        i::ModuleInfoEntry::cast(special_exports->get(i)), isolate);
+    i::Handle<i::Object> export_name(entry->export_name(), isolate);
+    if (export_name->IsUndefined(isolate)) continue;  // Star export.
+    i::Module::CreateIndirectExport(
+        module, i::Handle<i::String>::cast(export_name), entry);
+  }
+
+  for (int i = 0, length = v8_module->GetModuleRequestsLength(); i < length;
+       ++i) {
+    Local<Module> requested_module;
+    // TODO(adamk): Revisit these failure cases once d8 knows how to
+    // persist a module_map across multiple top-level module loads, as
+    // the current module is left in a "half-instantiated" state.
+    if (!callback(v8_context, v8_module->GetModuleRequest(i), v8_module,
+                  callback_data)
+             .ToLocal(&requested_module)) {
+      // TODO(adamk): Give this a better error message. But this is a
+      // misuse of the API anyway.
+      isolate->ThrowIllegalOperation();
+      return false;
+    }
+    if (!requested_module->Instantiate(v8_context, callback, callback_data)) {
+      return false;
+    }
+    module->requested_modules()->set(i, *Utils::OpenHandle(*requested_module));
+  }
+
+  // Resolve imports.
+  for (int i = 0, n = regular_imports->length(); i < n; ++i) {
+    i::Handle<i::ModuleInfoEntry> entry(
+        i::ModuleInfoEntry::cast(regular_imports->get(i)), isolate);
+    i::Handle<i::String> name(i::String::cast(entry->import_name()), isolate);
+    int module_request = i::Smi::cast(entry->module_request())->value();
+    if (i::Module::ResolveImport(module, name, module_request).is_null()) {
+      return false;
+    }
+  }
+
+  // Resolve indirect exports.
+  for (int i = 0, n = special_exports->length(); i < n; ++i) {
+    i::Handle<i::ModuleInfoEntry> entry(
+        i::ModuleInfoEntry::cast(special_exports->get(i)), isolate);
+    i::Handle<i::String> name(i::String::cast(entry->export_name()), isolate);
+    if (i::Module::ResolveExport(module, name).is_null()) {
+      return false;
+    }
+  }
+
   return true;
 }
 
 bool Module::Instantiate(Local<Context> context,
                          Module::ResolveCallback callback,
                          Local<Value> callback_data) {
   PREPARE_FOR_EXECUTION_BOOL(context, Module, Instantiate);
   has_pending_exception =
       !InstantiateModule(Utils::ToLocal(Utils::OpenHandle(this)), context,
                          callback, callback_data);
@@ skipping 7461 matching lines @@
   Address callback_address =
       reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
   VMState<EXTERNAL> state(isolate);
   ExternalCallbackScope call_scope(isolate, callback_address);
   callback(info);
 }
 
 
 }  // namespace internal
 }  // namespace v8