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

trunk/Source/JavaScriptCore/heap/MarkingConstraintSolver.h

@@ -65 +65 @@
     void execute(MarkingConstraint&);
     
-    // Parallel constraints can add parallel tasks.
-    void addParallelTask(RefPtr<SharedTask<void(SlotVisitor&)>>, MarkingConstraint&);
-    
 private:
     void runExecutionThread(SlotVisitor&, SchedulerPreference, ScopedLambda<std::optional<unsigned>()> pickNext);
     
-    struct TaskWithConstraint {
-        TaskWithConstraint() { }
-        
-        TaskWithConstraint(RefPtr<SharedTask<void(SlotVisitor&)>> task, MarkingConstraint* constraint)
-            : task(WTFMove(task))
-            , constraint(constraint)
-        {
-        }
-        
-        bool operator==(const TaskWithConstraint& other) const
-        {
-            return task == other.task
-                && constraint == other.constraint;
-        }
-        
-        RefPtr<SharedTask<void(SlotVisitor&)>> task;
-        MarkingConstraint* constraint { nullptr };
-    };
-    
+    void didExecute(ConstraintParallelism, unsigned index);
+
     Heap& m_heap;
     SlotVisitor& m_mainVisitor;
     MarkingConstraintSet& m_set;
     BitVector m_executed;
-    Deque<TaskWithConstraint, 32> m_toExecuteInParallel;
+    Deque<unsigned, 32> m_toExecuteInParallel;
+    BitVector m_toExecuteInParallelSet;
+    Vector<unsigned, 32> m_didExecuteInParallel;
     Vector<unsigned, 32> m_toExecuteSequentially;
     Lock m_lock;