Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 12 deletions

diff --git a/js/src/vm/Modules.h b/js/src/vm/Modules.h
index 21aff46b90..d59c9db552 100644
--- a/js/src/vm/Modules.h
+++ b/js/src/vm/Modules.h
@@ -20,22 +20,32 @@ namespace js {
 
 using ModuleVector = GCVector<ModuleObject*, 0, SystemAllocPolicy>;
 
-bool ModuleResolveExport(JSContext* cx, Handle<ModuleObject*> module,
-                         Handle<JSAtom*> exportName,
-                         MutableHandle<Value> result);
+// A struct with detailed error information when import/export failed.
+struct ModuleErrorInfo {
+  ModuleErrorInfo(uint32_t lineNumber_, JS::ColumnNumberOneOrigin columnNumber_)
+      : lineNumber(lineNumber_), columnNumber(columnNumber_) {}
 
-ModuleNamespaceObject* GetOrCreateModuleNamespace(JSContext* cx,
-                                                  Handle<ModuleObject*> module);
+  void setImportedModule(JSContext* cx, ModuleObject* importedModule);
+  void setCircularImport(JSContext* cx, ModuleObject* importedModule);
+  void setForAmbiguousImport(JSContext* cx, ModuleObject* importedModule,
+                             ModuleObject* module1, ModuleObject* module2);
+
+  uint32_t lineNumber;
+  JS::ColumnNumberOneOrigin columnNumber;
 
-bool ModuleInitializeEnvironment(JSContext* cx, Handle<ModuleObject*> module);
+  // The filename of the imported module.
+  const char* imported;
 
-bool ModuleLink(JSContext* cx, Handle<ModuleObject*> module);
+  // The filenames of the ambiguous entries.
+  const char* entry1;
+  const char* entry2;
 
-// Start evaluating the module. If TLA is enabled, result will be a promise.
-bool ModuleEvaluate(JSContext* cx, Handle<ModuleObject*> module,
-                    MutableHandle<Value> result);
-bool SyntheticModuleEvaluate(JSContext* cx, Handle<ModuleObject*> module,
-                             MutableHandle<Value> result);
+  // A bool to indicate the error is a circular import when it's true.
+  bool isCircular = false;
+};
+
+ModuleNamespaceObject* GetOrCreateModuleNamespace(JSContext* cx,
+                                                  Handle<ModuleObject*> module);
 
 void AsyncModuleExecutionFulfilled(JSContext* cx, Handle<ModuleObject*> module);