Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/IsoCellSet.cpp

Timestamp:

Jan 10, 2018, 11:41:12 AM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r226667 and r226673.
​https://bugs.webkit.org/show_bug.cgi?id=181488

This caused a flaky crash. (Requested by mlewis13 on #webkit).

Reverted changesets:

"CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226667

"REGRESSION (r226667): CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226673

File:

• trunk/Source/JavaScriptCore/heap/IsoCellSet.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/IsoCellSet.cpp

@@ -45 +45 @@
     if (isOnList())
         BasicRawSentinelNode<IsoCellSet>::remove();
-}
-
-RefPtr<SharedTask<MarkedBlock::Handle*()>> IsoCellSet::parallelNotEmptyMarkedBlockSource()
-{
-    class Task : public SharedTask<MarkedBlock::Handle*()> {
-    public:
-        Task(IsoCellSet& set)
-            : m_set(set)
-            , m_allocator(set.m_subspace.m_allocator)
-        {
-        }
-        
-        MarkedBlock::Handle* run() override
-        {
-            if (m_done)
-                return nullptr;
-            auto locker = holdLock(m_lock);
-            auto bits = m_allocator.m_markingNotEmpty & m_set.m_blocksWithBits;
-            m_index = bits.findBit(m_index, true);
-            if (m_index >= m_allocator.m_blocks.size()) {
-                m_done = true;
-                return nullptr;
-            }
-            return m_allocator.m_blocks[m_index++];
-        }
-        
-    private:
-        IsoCellSet& m_set;
-        MarkedAllocator& m_allocator;
-        size_t m_index { 0 };
-        Lock m_lock;
-        bool m_done { false };
-    };
-    
-    return adoptRef(new Task(*this));
 }