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

trunk/Source/JavaScriptCore/heap/MarkingConstraint.cpp

@@ -52 +52 @@
 }
 
-void MarkingConstraint::execute(SlotVisitor& visitor)
+ConstraintParallelism MarkingConstraint::execute(SlotVisitor& visitor)
 {
     VisitCounter visitCounter(visitor);
-    executeImpl(visitor);
+    ConstraintParallelism result = executeImpl(visitor);
     m_lastVisitCount += visitCounter.visitCount();
     if (verboseMarkingConstraint && visitCounter.visitCount())
         dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in execute)");
+    if (result == ConstraintParallelism::Parallel) {
+        // It's illegal to produce parallel work if you haven't advertised it upfront because the solver
+        // has optimizations for constraints that promise to never produce parallel work.
+        RELEASE_ASSERT(m_parallelism == ConstraintParallelism::Parallel);
+    }
+    return result;
 }
 
@@ -82 +88 @@
 }
 
-void MarkingConstraint::doParallelWork(SlotVisitor& visitor, SharedTask<void(SlotVisitor&)>& task)
+void MarkingConstraint::doParallelWork(SlotVisitor& visitor)
 {
     VisitCounter visitCounter(visitor);
-    task.run(visitor);
+    doParallelWorkImpl(visitor);
     if (verboseMarkingConstraint && visitCounter.visitCount())
         dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in doParallelWork)");
@@ -94 +100 @@
 }
 
+void MarkingConstraint::finishParallelWork(SlotVisitor& visitor)
+{
+    VisitCounter visitCounter(visitor);
+    finishParallelWorkImpl(visitor);
+    m_lastVisitCount += visitCounter.visitCount();
+    if (verboseMarkingConstraint && visitCounter.visitCount())
+        dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in finishParallelWork)");
+}
+
 void MarkingConstraint::prepareToExecuteImpl(const AbstractLocker&, SlotVisitor&)
+{
+}
+
+void MarkingConstraint::doParallelWorkImpl(SlotVisitor&)
+{
+    UNREACHABLE_FOR_PLATFORM();
+}
+
+void MarkingConstraint::finishParallelWorkImpl(SlotVisitor&)
 {
 }