Merging upstream version 126.0.

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

1 files changed, 18 insertions, 2 deletions

diff --git a/js/src/builtin/MapObject.h b/js/src/builtin/MapObject.h
index ef37b9912e..d47797eff7 100644
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/MapObject.h
@@ -168,7 +168,14 @@ class MapObject : public NativeObject {
       OrderedHashMap<Value, Value, UnbarrieredHashPolicy, CellAllocPolicy>;
   friend class OrderedHashTableRef<MapObject>;
 
-  static void sweepAfterMinorGC(JS::GCContext* gcx, MapObject* mapobj);
+  void clearNurseryRangesBeforeMinorGC();
+
+  // Sweeps a map that had nursery memory associated with it after a minor
+  // GC. This may finalize the map if it was in the nursery and has died.
+  //
+  // Returns a pointer to the map if it still has nursery memory associated with
+  // it, or nullptr.
+  static MapObject* sweepAfterMinorGC(JS::GCContext* gcx, MapObject* mapobj);
 
   size_t sizeOfData(mozilla::MallocSizeOf mallocSizeOf);
 
@@ -276,6 +283,7 @@ class MapIteratorObject : public NativeObject {
 
  private:
   inline MapObject::IteratorKind kind() const;
+  MapObject* target() const;
 };
 
 class SetObject : public NativeObject {
@@ -326,7 +334,14 @@ class SetObject : public NativeObject {
       OrderedHashSet<Value, UnbarrieredHashPolicy, CellAllocPolicy>;
   friend class OrderedHashTableRef<SetObject>;
 
-  static void sweepAfterMinorGC(JS::GCContext* gcx, SetObject* setobj);
+  void clearNurseryRangesBeforeMinorGC();
+
+  // Sweeps a set that had nursery memory associated with it after a minor
+  // GC. This may finalize the set if it was in the nursery and has died.
+  //
+  // Returns a pointer to the set if it still has nursery memory associated with
+  // it, or nullptr.
+  static SetObject* sweepAfterMinorGC(JS::GCContext* gcx, SetObject* setobj);
 
   size_t sizeOfData(mozilla::MallocSizeOf mallocSizeOf);
 
@@ -414,6 +429,7 @@ class SetIteratorObject : public NativeObject {
 
  private:
   inline SetObject::IteratorKind kind() const;
+  SetObject* target() const;
 };
 
 using SetInitGetPrototypeOp = NativeObject* (*)(JSContext*,