Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/MarkStackMergingConstraint.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/MarkStackMergingConstraint.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/MarkStackMergingConstraint.cpp

@@ -55 +55 @@
 }
 
-void MarkStackMergingConstraint::executeImpl(SlotVisitor& visitor)
+ConstraintParallelism MarkStackMergingConstraint::executeImpl(SlotVisitor& visitor)
 {
     m_heap.m_mutatorMarkStack->transferTo(visitor.mutatorMarkStack());
     m_heap.m_raceMarkStack->transferTo(visitor.mutatorMarkStack());
+    return ConstraintParallelism::Sequential;
 }