Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/ConservativeRoots.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/ConservativeRoots.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp

@@ -73 +73 @@
     HeapUtil::findGCObjectPointersForMarking(
         m_heap, markingVersion, newlyAllocatedVersion, filter, p,
-        [&] (void* p, HeapCell::Kind cellKind) {
-            if (cellKind == HeapCell::JSCell)
-                markHook.markKnownJSCell(static_cast<JSCell*>(p));
-            
+        [&] (void* p) {
             if (m_size == m_capacity)
                 grow();
@@ -107 +104 @@
 public:
     void mark(void*) { }
-    void markKnownJSCell(JSCell*) { }
 };
 
@@ -114 +110 @@
     DummyMarkHook dummy;
     genericAddSpan(begin, end, dummy);
+}
+
+void ConservativeRoots::add(void* begin, void* end, JITStubRoutineSet& jitStubRoutines)
+{
+    genericAddSpan(begin, end, jitStubRoutines);
 }
 
@@ -128 +129 @@
     {
         m_stubRoutines.mark(address);
-    }
-    
-    void markKnownJSCell(JSCell* cell)
-    {
-        if (cell->type() == CodeBlockType)
-            m_codeBlocks.mark(m_codeBlocksLocker, jsCast<CodeBlock*>(cell));
+        m_codeBlocks.mark(m_codeBlocksLocker, address);
     }