Bug 1916277 - Part 9: Store Preloaded resolved set in the root moduleScript. r=jonco

Allocate a ResolvedModuleSet in the top-level preloading module script, and
use the `aHostDefined` parameter in HostLoadImportedModule to get the
corresponding preloaded ResolvedModuleSet.

Differential Revision: https://phabricator.services.mozilla.com/D272782

Author: allstarschh

js/loader/LoadedScript.cpp

@@ -482,4 +482,12 @@ void ModuleScript::SetErrorToRethrow(const Value& aError) {
 void ModuleScript::SetForPreload(bool aValue) { mForPreload = aValue; }
 void ModuleScript::SetHadImportMap(bool aValue) { mHadImportMap = aValue; }
 
+ResolvedModuleSet* ModuleScript::GetPreloadedResolvedSet() {
+  if (!mPreloadedResolvedSet) {
+    mPreloadedResolvedSet = mozilla::MakeUnique<ResolvedModuleSet>();
+  }
+
+  return mPreloadedResolvedSet.get();
+}
+
 }  // namespace JS::loader

js/loader/LoadedScript.h

@@ -28,6 +28,7 @@
 #include "nsIMemoryReporter.h"
 
 #include "jsapi.h"
+#include "ResolvedModuleSet.h"
 #include "ScriptKind.h"
 #include "ScriptFetchOptions.h"
 
@@ -664,6 +665,8 @@ class ModuleScript final : public LoadedScript {
   bool mForPreload = false;
   bool mHadImportMap = false;
 
+  mozilla::UniquePtr<JS::loader::ResolvedModuleSet> mPreloadedResolvedSet;
+
   ~ModuleScript();
 
  public:
@@ -713,6 +716,10 @@ class ModuleScript final : public LoadedScript {
   void UpdateReferrerPolicy(mozilla::dom::ReferrerPolicy aReferrerPolicy) {
     mReferrerPolicy = aReferrerPolicy;
   }
+
+  bool HasPreloadedResolvedSet() { return !!mPreloadedResolvedSet; }
+  ResolvedModuleSet* GetPreloadedResolvedSet();
+  void ReleasePreloadedResolvedSet() { mPreloadedResolvedSet = nullptr; }
 };
 
 ClassicScript* LoadedScript::AsClassicScript() {

js/loader/ModuleLoaderBase.cpp

@@ -1141,11 +1141,32 @@ static void AddToResolvedSet(ResolvedModuleSet* aSet,
   MOZ_ALWAYS_TRUE(aSet->add(ptr, std::move(aRecord)));
 }
 
+void ModuleLoaderBase::AddToPreloadedResolvedSet(
+    ModuleLoadRequest* aRootRequest,
+    UniquePtr<SpecifierResolutionRecord> aRecord) {
+  MOZ_ASSERT(aRootRequest);
+  MOZ_ASSERT(aRootRequest->mModuleScript);
+
+  ResolvedModuleSet* set =
+      aRootRequest->mModuleScript->GetPreloadedResolvedSet();
+  MOZ_ASSERT(set);
+  AddToResolvedSet(set, std::move(aRecord));
+}
+
 void ModuleLoaderBase::AddToGlobalResolvedSet(
     UniquePtr<SpecifierResolutionRecord> aRecord) {
   AddToResolvedSet(GetResolvedModuleSet(), std::move(aRecord));
 }
 
+static ModuleLoadRequest* GetPreloadRootModuleRequest(
+    JS::Handle<JS::Value> aHostDefined) {
+  MOZ_ASSERT(!aHostDefined.isUndefined());
+  ModuleLoadRequest* parent =
+      static_cast<ModuleLoadRequest*>(aHostDefined.toPrivate());
+  MOZ_ASSERT(parent);
+  return parent->GetRootModule();
+}
+
 void ModuleLoaderBase::AddToResolvedModuleSet(
     UniquePtr<SpecifierResolutionRecord> aRecord, LoadedScript* aScript,
     Handle<Value> aHostDefined) {
@@ -1154,6 +1175,14 @@ void ModuleLoaderBase::AddToResolvedModuleSet(
     return;
   }
 
+  bool isPreloadModule = aScript && aScript->IsModuleScript() &&
+                         aScript->AsModuleScript()->ForPreload();
+  if (isPreloadModule) {
+    RefPtr<ModuleLoadRequest> root = GetPreloadRootModuleRequest(aHostDefined);
+    AddToPreloadedResolvedSet(root, std::move(aRecord));
+    return;
+  }
+
   // release the mResult from the record as it is not needed.
   nsCOMPtr<nsIURI> _ = aRecord->TakeResult();
   AddToGlobalResolvedSet(std::move(aRecord));

js/loader/ModuleLoaderBase.h

@@ -534,6 +534,10 @@ class ModuleLoaderBase : public nsISupports {
   bool IsModuleFetching(const ModuleMapKey& key) const;
   void WaitForModuleFetch(ModuleLoadRequest* aRequest);
 
+  void AddToPreloadedResolvedSet(
+      ModuleLoadRequest* aRootRequest,
+      mozilla::UniquePtr<SpecifierResolutionRecord> aRecord);
+
   void AddToGlobalResolvedSet(
       mozilla::UniquePtr<SpecifierResolutionRecord> aRecord);