[modules] Detect and throw exceptions for cyclic dependencies

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 28 matching lines @@
 #include "src/execution.h"
 #include "src/frames-inl.h"
 #include "src/gdb-jit.h"
 #include "src/global-handles.h"
 #include "src/globals.h"
 #include "src/icu_util.h"
 #include "src/isolate-inl.h"
 #include "src/json-parser.h"
 #include "src/json-stringifier.h"
 #include "src/messages.h"
+#include "src/module-resolve-set-inl.h"
 #include "src/parsing/parser.h"
 #include "src/parsing/scanner-character-streams.h"
 #include "src/pending-compilation-error-handler.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/profiler/heap-profiler.h"
 #include "src/profiler/heap-snapshot-generator-inl.h"
 #include "src/profiler/profile-generator-inl.h"
 #include "src/profiler/tick-sample.h"
 #include "src/property-descriptor.h"
 #include "src/property-details.h"
 #include "src/property.h"
 #include "src/prototype.h"
 #include "src/runtime-profiler.h"
 #include "src/runtime/runtime.h"
 #include "src/simulator.h"
 #include "src/snapshot/code-serializer.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/snapshot.h"
 #include "src/startup-data-util.h"
 #include "src/tracing/trace-event.h"
 #include "src/unicode-inl.h"
 #include "src/v8.h"
 #include "src/v8threads.h"
 #include "src/value-serializer.h"
 #include "src/version.h"
 #include "src/vm-state-inl.h"
 #include "src/wasm/wasm-module.h"
+#include "src/zone/zone.h"
 
 namespace v8 {
 
 #define LOG_API(isolate, class_name, function_name)                       \
   i::RuntimeCallTimerScope _runtime_timer(                                \
       isolate, &i::RuntimeCallStats::API_##class_name##_##function_name); \
   LOG(isolate, ApiEntryCall("v8::" #class_name "::" #function_name))
 
 #define ENTER_V8(isolate) i::VMState<v8::OTHER> __state__((isolate))
 
@@ skipping 1883 matching lines @@
     // 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)) {
+    module->requested_modules()->set(i, *Utils::OpenHandle(*requested_module));
+    if (!InstantiateModule(requested_module, v8_context, callback,
+                           callback_data)) {
       return false;
     }
-    module->requested_modules()->set(i, *Utils::OpenHandle(*requested_module));
   }
 
+  i::Zone zone(isolate->allocator());
+
   // 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()) {
+    i::Module::ResolveSet resolve_set(&zone);
+    if (i::Module::ResolveImport(module, name, module_request, &resolve_set,
+                                 &zone)
+            .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()) {
+    i::Module::ResolveSet resolve_set(&zone);
+    if (i::Module::ResolveExport(module, name, &resolve_set, &zone).is_null()) {
       return false;
     }
   }
 
   return true;
 }
 
 bool Module::Instantiate(Local<Context> context,
                          Module::ResolveCallback callback,
                          Local<Value> callback_data) {
@@ skipping 7470 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