Add support for WeakSet

Change-Id: I5cee2bf0c6a45ad2c14b52e1a4fc5ef015e01042
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 20 insertions, 0 deletions

diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
index 065204b5d3..b9e6327ea2 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -62,6 +62,7 @@
 #include "qv4alloca_p.h"
 #include "qv4profiling_p.h"
 #include "qv4mapobject_p.h"
+#include "qv4setobject_p.h"
 
 //#define MM_STATS
 
@@ -989,6 +990,17 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt
         map = map->nextWeakMap;
     }
 
+    Heap::SetObject *set = weakSets;
+    Heap::SetObject **lastSet = &weakSets;
+    while (set) {
+        if (set->isMarked()) {
+            set->removeUnmarkedKeys();
+            *lastSet = set;
+            lastSet = &set->nextWeakSet;
+        }
+        set = set->nextWeakSet;
+    }
+
     // onDestruction handlers may have accessed other QObject wrappers and reset their value, so ensure
     // that they are all set to undefined.
     for (PersistentValueStorage::Iterator it = m_weakValues->begin(); it != m_weakValues->end(); ++it) {
@@ -1198,6 +1210,12 @@ void MemoryManager::registerWeakMap(Heap::MapObject *map)
     weakMaps = map;
 }
 
+void MemoryManager::registerWeakSet(Heap::SetObject *set)
+{
+    set->nextWeakSet = weakSets;
+    weakSets = set;
+}
+
 MemoryManager::~MemoryManager()
 {
     delete m_persistentValues;
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
index da162d2dfe..bbbbb1aef6 100644
--- a/src/qml/memory/qv4mm_p.h
+++ b/src/qml/memory/qv4mm_p.h
@@ -275,6 +275,7 @@ public:
     }
 
     void registerWeakMap(Heap::MapObject *map);
+    void registerWeakSet(Heap::SetObject *set);
 
 protected:
     /// expects size to be aligned
@@ -299,6 +300,7 @@ public:
     PersistentValueStorage *m_weakValues;
     QVector<Value *> m_pendingFreedObjectWrapperValue;
     Heap::MapObject *weakMaps = nullptr;
+    Heap::SetObject *weakSets = nullptr;
 
     std::size_t unmanagedHeapSize = 0; // the amount of bytes of heap that is not managed by the memory manager, but which is held onto by managed items.
     std::size_t unmanagedHeapSizeGCLimit;