Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/SimpleMarkingConstraint.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/SimpleMarkingConstraint.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/SimpleMarkingConstraint.h

@@ -32 +32 @@
 
 // This allows for an informal way to define constraints. Just pass a lambda to the constructor. The only
-// downside is that this makes it hard for constraints to override any functions in MarkingConstraint
-// other than executeImpl. In those cases, just subclass MarkingConstraint.
+// downside is that this makes it hard for constraints to be stateful, which is necessary for them to be
+// parallel. In those cases, it's easier to just subclass MarkingConstraint.
 class SimpleMarkingConstraint : public MarkingConstraint {
 public:
@@ -40 +40 @@
         ::Function<void(SlotVisitor&)>,
         ConstraintVolatility,
-        ConstraintConcurrency = ConstraintConcurrency::Concurrent,
-        ConstraintParallelism = ConstraintParallelism::Sequential);
-    
-    SimpleMarkingConstraint(
-        CString abbreviatedName, CString name,
-        ::Function<void(SlotVisitor&)> func,
-        ConstraintVolatility volatility,
-        ConstraintParallelism parallelism)
-        : SimpleMarkingConstraint(abbreviatedName, name, WTFMove(func), volatility, ConstraintConcurrency::Concurrent, parallelism)
-    {
-    }
+        ConstraintConcurrency = ConstraintConcurrency::Concurrent);
     
     JS_EXPORT_PRIVATE ~SimpleMarkingConstraint();
     
 private:
-    void executeImpl(SlotVisitor&) override;
+    ConstraintParallelism executeImpl(SlotVisitor&) override;
 
     ::Function<void(SlotVisitor&)> m_executeFunction;