Changeset 295703 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Jun 21, 2022, 4:57:05 PM (3 years ago)

Author:

[email protected]

Message:

Unreviewed, revert "The extraMemorySize() get wrong when transferring ArrayBuffer from Worker VM"
​https://bugs.webkit.org/show_bug.cgi?id=241826
rdar://95384643

This reverts commit 71960bed2a3ee0917367bc4144911a9e8168deea.

m_extraMemorySize must be monotonically increasing during GC cycles until
full-collection happens. And after the full-collection, it is adjusted.
We already adjusted it in sweep of m_arrayBuffer, so, we should not reduce
that number. This is used for GC invocation scheduling. So, if we would like to
have a number which more precisely reflecting the current status,
then we should have yet another one. And we can still use extraMemorySize
since it will be adjusted after the full-collection. So we can consider
that transferred array-buffer is collected at the full-collection.

Canonical link: ​https://commits.webkit.org/251708@main

Location:

trunk/Source/JavaScriptCore/heap

Files:

• GCIncomingRefCountedSet.h (modified) (1 diff)
• GCIncomingRefCountedSetInlines.h (modified) (1 diff)
• Heap.cpp (modified) (1 diff)
• Heap.h (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h

@@ -45 +45 @@
     
     size_t size() const { return m_bytes; };
-    void reduceSize(size_t);
     
 private:

trunk/Source/JavaScriptCore/heap/GCIncomingRefCountedSetInlines.h

@@ -73 +73 @@
         m_vector.removeLast();
     }
-
-    constexpr bool verify = false;
-    if constexpr (verify) {
-        CheckedSize size;
-        for (size_t i = m_vector.size(); i--;) {
-            T* object = m_vector[i];
-            size += object->gcSizeEstimateInBytes();
-        }
-        ASSERT(m_bytes == size);
-    }
-}
-
-template<typename T>
-void GCIncomingRefCountedSet<T>::reduceSize(size_t bytes)
-{
-    ASSERT(m_bytes >= bytes);
-    m_bytes -= bytes;
 }
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -660 +660 @@
 }
 
-void Heap::reduceArrayBufferSize(size_t bytes)
-{
-    m_arrayBuffers.reduceSize(bytes);
-}
-
 template<typename CellType, typename CellSet>
 void Heap::finalizeMarkedUnconditionalFinalizers(CellSet& cellSet)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -440 +440 @@
     
     void addReference(JSCell*, ArrayBuffer*);
-    void reduceArrayBufferSize(size_t bytes);
     
     bool isDeferred() const { return !!m_deferralDepth; }