Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/MarkingConstraint.h

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.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/MarkingConstraint.h

@@ -33 +33 @@
 #include <wtf/Lock.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/SharedTask.h>
 #include <wtf/text/CString.h>
 
@@ -61 +60 @@
     size_t lastVisitCount() const { return m_lastVisitCount; }
     
-    void execute(SlotVisitor&);
+    ConstraintParallelism execute(SlotVisitor&);
     
     JS_EXPORT_PRIVATE virtual double quickWorkEstimate(SlotVisitor& visitor);
@@ -69 +68 @@
     void prepareToExecute(const AbstractLocker& constraintSolvingLocker, SlotVisitor&);
     
-    void doParallelWork(SlotVisitor&, SharedTask<void(SlotVisitor&)>&);
+    void doParallelWork(SlotVisitor&);
+    void finishParallelWork(SlotVisitor&);
     
     ConstraintVolatility volatility() const { return m_volatility; }
@@ -77 +77 @@
 
 protected:
-    virtual void executeImpl(SlotVisitor&) = 0;
+    virtual ConstraintParallelism executeImpl(SlotVisitor&) = 0;
     JS_EXPORT_PRIVATE virtual void prepareToExecuteImpl(const AbstractLocker& constraintSolvingLocker, SlotVisitor&);
+    virtual void doParallelWorkImpl(SlotVisitor&);
+    virtual void finishParallelWorkImpl(SlotVisitor&);
     
 private: