what about ff147?

Author: andreiltd

builtins/web/crypto/uuid.cpp

@@ -1,6 +1,8 @@
 #include "uuid.h"
 #include "host_api.h"
 
+#include <fmt/format.h>
+
 
 
 namespace builtins::web::crypto {

builtins/web/event/event-target.cpp

@@ -123,6 +123,7 @@ template <typename T> struct GCPolicy<RefPtr<T>> {
     }
     return true;
   }
+  static constexpr bool mightBeInNursery() { return false; }
 };
 
 } // namespace JS

cmake/spidermonkey.cmake

@@ -1,4 +1,4 @@
-set(SM_TAG FIREFOX_140_0_4_RELEASE_STARLING)
+set(SM_TAG FIREFOX_147_0_4_RELEASE_STARLING)
 
 include("manage-git-source")
 
@@ -12,7 +12,6 @@ option(WEVAL "Build with a SpiderMonkey variant that supports weval-based AOT co
 
 if (WEVAL)
     set(SM_BUILD_TYPE "${SM_BUILD_TYPE}_weval")
-    set(SM_TAG WEVAL)
 endif()
 
 # If the developer has specified an alternate local set of SpiderMonkey

runtime/engine.cpp

@@ -15,6 +15,7 @@
 #include <cassert>
 #include <chrono>
 #include <cstdlib>
+#include <fmt/format.h>
 #include <utility>
 
 #ifdef MEM_STATS

runtime/script_loader.cpp

@@ -4,6 +4,7 @@
 #include <cstdio>
 #include <js/CompilationAndEvaluation.h>
 #include <js/MapAndSet.h>
+#include <js/ScriptPrivate.h>
 #include <js/Value.h>
 #include <jsfriendapi.h>
 #include <sys/stat.h>
@@ -310,36 +311,54 @@ static JSObject* get_builtin_module(JSContext* cx, HandleValue id, HandleObject
   return module;
 }
 
-JSObject* module_resolve_hook(JSContext* cx, HandleValue referencingPrivate,
-                              HandleObject moduleRequest) {
+bool module_load_hook(JSContext* cx, JS::HandleScript referrer,
+                      JS::HandleObject moduleRequest, JS::HandleValue hostDefined,
+                      JS::HandleValue payload, uint32_t lineNumber,
+                      JS::ColumnNumberOneOrigin columnNumber) {
   RootedString specifier(cx, GetModuleRequestSpecifier(cx, moduleRequest));
   if (!specifier) {
-    return nullptr;
+    return false;
   }
 
   RootedValue path_val(cx, StringValue(specifier));
   auto path = JS_EncodeStringToUTF8(cx, specifier);
   if (!path) {
-    return nullptr;
+    return false;
   }
 
   RootedValue builtin_val(cx);
   if (!MapGet(cx, builtinModules, path_val, &builtin_val)) {
-    return nullptr; 
+    return false;
   }
   if (!builtin_val.isUndefined()) {
     RootedValue specifier_val(cx, StringValue(specifier));
     RootedObject builtin_obj(cx, &builtin_val.toObject());
-    return get_builtin_module(cx, specifier_val, builtin_obj);
+    RootedObject result(cx, get_builtin_module(cx, specifier_val, builtin_obj));
+    if (!result) {
+      return false;
+    }
+    return FinishLoadingImportedModule(cx, referrer, moduleRequest, payload,
+                                       result, false);
+  }
+
+  RootedValue referencingPrivate(cx);
+  if (referrer) {
+    referencingPrivate = JS::GetScriptPrivate(referrer);
+  }
+
+  if (referencingPrivate.isUndefined() || !referencingPrivate.isObject()) {
+    JS_ReportErrorASCII(cx, "Module referrer has no private value");
+    return false;
   }
 
   RootedObject info(cx, &referencingPrivate.toObject());
   RootedValue parent_path_val(cx);
   if (!JS_GetProperty(cx, info, "id", &parent_path_val)) {
-    return nullptr;
+    return false;
   }
   if (!parent_path_val.isString()) {
-    return nullptr;
+    JS_ReportErrorASCII(cx, "Module referrer has no id property");
+    return false;
   }
 
   HostString str = core::encode(cx, parent_path_val);
@@ -348,7 +367,12 @@ JSObject* module_resolve_hook(JSContext* cx, HandleValue referencingPrivate,
   JS::CompileOptions opts(cx, *COMPILE_OPTS);
   auto stripped = strip_prefix(resolved_path, PATH_PREFIX);
   opts.setFileAndLine(stripped.c_str(), 1);
-  return get_module(cx, path.get(), resolved_path, opts);
+  RootedObject result(cx, get_module(cx, path.get(), resolved_path, opts));
+  if (!result) {
+    return false;
+  }
+  return FinishLoadingImportedModule(cx, referrer, moduleRequest, payload,
+                                     result, false);
 }
 
 bool module_metadata_hook(JSContext* cx, HandleValue referencingPrivate, HandleObject metaObject) {
@@ -384,7 +408,7 @@ ScriptLoader::ScriptLoader(api::Engine* engine, JS::CompileOptions *opts,
   MOZ_RELEASE_ASSERT(moduleRegistry);
   MOZ_RELEASE_ASSERT(builtinModules);
   JSRuntime *rt = JS_GetRuntime(cx);
-  SetModuleResolveHook(rt, module_resolve_hook);
+  SetModuleLoadHook(rt, module_load_hook);
   SetModuleMetadataHook(rt, module_metadata_hook);
 }
 
@@ -491,7 +515,20 @@ bool ScriptLoader::eval_top_level_script(std::string_view path, JS::SourceText<m
     if (!module) {
       return false;
     }
-    if (!ModuleLink(cx, module)) {
+    RootedValue hostDefined(cx, ObjectValue(*module));
+    if (!LoadRequestedModules(cx, module, hostDefined,
+                              [](JSContext* cx, JS::Handle<JS::Value> hd) {
+                                JS::RootedObject mod(cx, &hd.toObject());
+                                return JS::ModuleLink(cx, mod);
+                              },
+                              [](JSContext* cx, JS::Handle<JS::Value>,
+                                 JS::Handle<JS::Value> error) {
+                                JS_SetPendingException(cx, error);
+                                return true;
+                              })) {
+      return false;
+    }
+    if (JS_IsExceptionPending(cx)) {
       return false;
     }
   } else {