[webkit-changes] [227913] branches/safari-605-branch/Source/JavaScriptCore/heap

[jmarcell]

Title: [227913] branches/safari-605-branch/Source/_javascript_Core/heap

Revision

227913

Author

jmarc...@apple.com

Date

2018-01-31 11:21:51 -0800 (Wed, 31 Jan 2018)

Log Message

Apply patch. rdar://problem/37077980

    Build fix

Modified Paths

branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSet.cpp
branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSetInlines.h
branches/safari-605-branch/Source/_javascript_Core/heap/Subspace.cpp

Diff

Modified: branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSet.cpp (227912 => 227913)

--- branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSet.cpp	2018-01-31 19:21:48 UTC (rev 227912)
+++ branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSet.cpp	2018-01-31 19:21:51 UTC (rev 227913)
@@ -52,7 +52,7 @@
     public:
         Task(IsoCellSet& set)
             : m_set(set)
-            , m_allocator(set.m_subspace.m_allocator)
+            , m_directory(set.m_subspace.m_directory)
         {
         }
         
@@ -61,18 +61,18 @@
             if (m_done)
                 return nullptr;
             auto locker = holdLock(m_lock);
-            auto bits = m_allocator.m_markingNotEmpty & m_set.m_blocksWithBits;
+            auto bits = m_directory.m_markingNotEmpty & m_set.m_blocksWithBits;
             m_index = bits.findBit(m_index, true);
-            if (m_index >= m_allocator.m_blocks.size()) {
+            if (m_index >= m_directory.m_blocks.size()) {
                 m_done = true;
                 return nullptr;
             }
-            return m_allocator.m_blocks[m_index++];
+            return m_directory.m_blocks[m_index++];
         }
         
     private:
         IsoCellSet& m_set;
-        MarkedAllocator& m_allocator;
+        BlockDirectory& m_directory;
         size_t m_index { 0 };
         Lock m_lock;
         bool m_done { false };

Modified: branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSetInlines.h (227912 => 227913)

--- branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSetInlines.h	2018-01-31 19:21:48 UTC (rev 227912)
+++ branches/safari-605-branch/Source/_javascript_Core/heap/IsoCellSetInlines.h	2018-01-31 19:21:51 UTC (rev 227913)
@@ -117,10 +117,10 @@
 template<typename Func>
 void IsoCellSet::forEachLiveCell(const Func& func)
 {
-    MarkedAllocator& allocator = m_subspace.m_allocator;
+    BlockDirectory& directory = m_subspace.m_directory;
     m_blocksWithBits.forEachSetBit(
         [&] (size_t blockIndex) {
-            MarkedBlock::Handle* block = allocator.m_blocks[blockIndex];
+            MarkedBlock::Handle* block = directory.m_blocks[blockIndex];
 
             // FIXME: We could optimize this by checking our bits before querying isLive.
             // OOPS! (need bug URL)

Modified: branches/safari-605-branch/Source/_javascript_Core/heap/Subspace.cpp (227912 => 227913)

--- branches/safari-605-branch/Source/_javascript_Core/heap/Subspace.cpp	2018-01-31 19:21:48 UTC (rev 227912)
+++ branches/safari-605-branch/Source/_javascript_Core/heap/Subspace.cpp	2018-01-31 19:21:51 UTC (rev 227913)
@@ -128,9 +128,9 @@
 
 void Subspace::sweep()
 {
-    forEachAllocator(
-        [&] (MarkedAllocator& allocator) {
-            allocator.sweep();
+    forEachDirectory(
+        [&] (BlockDirectory& directory) {
+            directory.sweep();
         });
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes