[heap] Cleanup: Untangle marking state and deque in incremental marking

src/heap/incremental-marking.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HEAP_INCREMENTAL_MARKING_H_
 #define V8_HEAP_INCREMENTAL_MARKING_H_
 
 #include "src/cancelable-task.h"
 #include "src/execution.h"
 #include "src/heap/heap.h"
@@ skipping 14 matching lines @@
 class V8_EXPORT_PRIVATE IncrementalMarking {
  public:
   enum State { STOPPED, SWEEPING, MARKING, COMPLETE };
 
   enum CompletionAction { GC_VIA_STACK_GUARD, NO_GC_VIA_STACK_GUARD };
 
   enum ForceCompletionAction { FORCE_COMPLETION, DO_NOT_FORCE_COMPLETION };
 
   enum GCRequestType { NONE, COMPLETE_MARKING, FINALIZATION };
 
-  static void MarkGrey(Heap* heap, HeapObject* object);

[Michael Lippautz, 2017/04/28 12:49:40]

MarkGrey and MarkBlack are now instance methods.

+  static void Initialize();
 
-  static void MarkBlack(HeapObject* object, int size);
+  explicit IncrementalMarking(Heap* heap);
+
+  MarkingState marking_state(HeapObject* object) const {
+    return MarkingState::Internal(object);
+  }
+
+  MarkingState marking_state(MemoryChunk* chunk) const {
+    return MarkingState::Internal(chunk);
+  }
+
+  void MarkBlack(HeapObject* object, int size);
+  void MarkGrey(Heap* heap, HeapObject* object);
 
   // Transfers mark bits without requiring proper object headers.
-  static void TransferMark(Heap* heap, HeapObject* from, HeapObject* to);
+  void TransferMark(Heap* heap, HeapObject* from, HeapObject* to);
 
   // Transfers color including live byte count, requiring properly set up
   // objects.
   template <MarkBit::AccessMode access_mode = MarkBit::NON_ATOMIC>
-  V8_INLINE static void TransferColor(HeapObject* from, HeapObject* to) {
-    if (ObjectMarking::IsBlack<access_mode>(to, MarkingState::Internal(to))) {
-      DCHECK(to->GetHeap()->incremental_marking()->black_allocation());
+  V8_INLINE void TransferColor(HeapObject* from, HeapObject* to) {
+    if (ObjectMarking::IsBlack<access_mode>(to, marking_state(to))) {
+      DCHECK(black_allocation());
       return;
     }
 
-    DCHECK(ObjectMarking::IsWhite<access_mode>(to, MarkingState::Internal(to)));
-    if (ObjectMarking::IsGrey<access_mode>(from,
-                                           MarkingState::Internal(from))) {
-      ObjectMarking::WhiteToGrey<access_mode>(to, MarkingState::Internal(to));
-    } else if (ObjectMarking::IsBlack<access_mode>(
-                   from, MarkingState::Internal(from))) {
-      ObjectMarking::WhiteToBlack<access_mode>(to, MarkingState::Internal(to));
+    DCHECK(ObjectMarking::IsWhite<access_mode>(to, marking_state(to)));
+    if (ObjectMarking::IsGrey<access_mode>(from, marking_state(from))) {
+      ObjectMarking::WhiteToGrey<access_mode>(to, marking_state(to));
+    } else if (ObjectMarking::IsBlack<access_mode>(from, marking_state(from))) {
+      ObjectMarking::WhiteToBlack<access_mode>(to, marking_state(to));
     }
   }
 
-  explicit IncrementalMarking(Heap* heap);
-
-  static void Initialize();
 
   State state() {
     DCHECK(state_ == STOPPED || FLAG_incremental_marking);
     return state_;
   }
 
   bool should_hurry() { return should_hurry_; }
   void set_should_hurry(bool val) { should_hurry_ = val; }
 
   bool finalize_marking_completed() const {
@@ skipping 138 matching lines @@
   IncrementalMarkingJob* incremental_marking_job() {
     return &incremental_marking_job_;
   }
 
   bool black_allocation() { return black_allocation_; }
 
   void StartBlackAllocationForTesting() { StartBlackAllocation(); }
 
   void AbortBlackAllocation();
 
+  MarkingDeque* marking_deque() {
+    SLOW_DCHECK(marking_deque_ != nullptr);
+    return marking_deque_;
+  }
+
+  void set_marking_deque(MarkingDeque* marking_deque) {
+    marking_deque_ = marking_deque;
+  }
+
  private:
   class Observer : public AllocationObserver {
    public:
     Observer(IncrementalMarking& incremental_marking, intptr_t step_size)
         : AllocationObserver(step_size),
           incremental_marking_(incremental_marking) {}
 
     void Step(int bytes_allocated, Address, size_t) override {
       incremental_marking_.AdvanceIncrementalMarkingOnAllocation();
     }
@@ skipping 37 matching lines @@
   INLINE(void VisitObject(Map* map, HeapObject* obj, int size));
 
   void IncrementIdleMarkingDelayCounter();
 
   void AdvanceIncrementalMarkingOnAllocation();
 
   size_t StepSizeToKeepUpWithAllocations();
   size_t StepSizeToMakeProgress();
 
   Heap* heap_;
+  MarkingDeque* marking_deque_;
 
   double start_time_ms_;
   size_t initial_old_generation_size_;
   size_t old_generation_allocation_counter_;
   size_t bytes_allocated_;
   size_t bytes_marked_ahead_of_schedule_;
   size_t unscanned_bytes_of_large_object_;
 
   State state_;
 
@@ skipping 12 matching lines @@
 
   Observer new_generation_observer_;
   Observer old_generation_observer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_INCREMENTAL_MARKING_H_