Merging upstream version 126.0.

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

1 files changed, 19 insertions, 1 deletions

diff --git a/js/src/vm/InvalidatingFuse.cpp b/js/src/vm/InvalidatingFuse.cpp
index 3e14d72fcc..cae8875a19 100644
--- a/js/src/vm/InvalidatingFuse.cpp
+++ b/js/src/vm/InvalidatingFuse.cpp
@@ -22,7 +22,8 @@ js::DependentScriptSet::DependentScriptSet(JSContext* cx,
 bool js::InvalidatingRuntimeFuse::addFuseDependency(JSContext* cx,
                                                     Handle<JSScript*> script) {
   auto* zone = script->zone();
-  DependentScriptSet* dss = zone->getOrCreateDependentScriptSet(cx, this);
+  DependentScriptSet* dss =
+      zone->fuseDependencies.getOrCreateDependentScriptSet(cx, this);
   if (!dss) {
     return false;
   }
@@ -80,3 +81,20 @@ bool js::DependentScriptSet::addScriptForFuse(InvalidatingFuse* fuse,
   // Script is already in the set, no need to re-add.
   return true;
 }
+
+js::DependentScriptSet* js::DependentScriptGroup::getOrCreateDependentScriptSet(
+    JSContext* cx, js::InvalidatingFuse* fuse) {
+  for (auto& dss : dependencies) {
+    if (dss.associatedFuse == fuse) {
+      return &dss;
+    }
+  }
+
+  if (!dependencies.emplaceBack(cx, fuse)) {
+    return nullptr;
+  }
+
+  auto& dss = dependencies.back();
+  MOZ_ASSERT(dss.associatedFuse == fuse);
+  return &dss;
+}