Revert of [heap] Provide ObjectMarking with marking transitions

src/heap/mark-compact.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_MARK_COMPACT_H_
 #define V8_HEAP_MARK_COMPACT_H_
 
 #include <deque>
 
 #include "src/base/bits.h"
@@ skipping 28 matching lines @@
   V8_INLINE static MarkBit MarkBitFrom(HeapObject* obj) {
     const Address address = obj->address();
     MemoryChunk* p = MemoryChunk::FromAddress(address);
     return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(address));
   }
 
   static Marking::ObjectColor Color(HeapObject* obj) {
     return Marking::Color(ObjectMarking::MarkBitFrom(obj));
   }
 
-  V8_INLINE static bool IsImpossible(HeapObject* obj) {
-    return Marking::IsImpossible(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static bool IsBlack(HeapObject* obj) {
-    return Marking::IsBlack(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static bool IsWhite(HeapObject* obj) {
-    return Marking::IsWhite(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static bool IsGrey(HeapObject* obj) {
-    return Marking::IsGrey(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static bool IsBlackOrGrey(HeapObject* obj) {
-    return Marking::IsBlackOrGrey(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static void ClearMarkBit(HeapObject* obj) {
-    Marking::MarkWhite(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static void BlackToWhite(HeapObject* obj) {
-    DCHECK(IsBlack(obj));
-    MarkBit markbit = MarkBitFrom(obj);
-    Marking::BlackToWhite(markbit);
-    MemoryChunk::IncrementLiveBytes(obj, -obj->Size());
-  }
-
-  V8_INLINE static void GreyToWhite(HeapObject* obj) {
-    DCHECK(IsGrey(obj));
-    Marking::GreyToWhite(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static void BlackToGrey(HeapObject* obj) {
-    DCHECK(IsBlack(obj));
-    MarkBit markbit = MarkBitFrom(obj);
-    Marking::BlackToGrey(markbit);
-    MemoryChunk::IncrementLiveBytes(obj, -obj->Size());
-  }
-
-  V8_INLINE static void WhiteToGrey(HeapObject* obj) {
-    DCHECK(IsWhite(obj));
-    Marking::WhiteToGrey(MarkBitFrom(obj));
-  }
-
-  V8_INLINE static void WhiteToBlack(HeapObject* obj) {
-    DCHECK(IsWhite(obj));
-    MarkBit markbit = MarkBitFrom(obj);
-    Marking::WhiteToBlack(markbit);
-    MemoryChunk::IncrementLiveBytes(obj, obj->Size());
-  }
-
-  V8_INLINE static void GreyToBlack(HeapObject* obj) {
-    DCHECK(IsGrey(obj));
-    MarkBit markbit = MarkBitFrom(obj);
-    Marking::GreyToBlack(markbit);
-    MemoryChunk::IncrementLiveBytes(obj, obj->Size());
-  }
-
-  V8_INLINE static void AnyToGrey(HeapObject* obj) {
-    MarkBit markbit = MarkBitFrom(obj);
-    if (Marking::IsBlack(markbit)) {
-      MemoryChunk::IncrementLiveBytes(obj, -obj->Size());
-    }
-    Marking::AnyToGrey(markbit);
-  }
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ObjectMarking);
 };
 
 // ----------------------------------------------------------------------------
 // Marking deque for tracing live objects.
 class MarkingDeque {
  public:
   explicit MarkingDeque(Heap* heap)
       : backing_store_(nullptr),
@@ skipping 529 matching lines @@
   // Unshifts a black object into the marking stack and accounts for live bytes.
   // Note that this assumes lives bytes have already been counted.
   INLINE(void UnshiftBlack(HeapObject* obj));
 
   // Marks the object black and pushes it on the marking stack.
   // This is for non-incremental marking only.
   INLINE(void MarkObject(HeapObject* obj, MarkBit mark_bit));
 
   // Marks the object black assuming that it is not yet marked.
   // This is for non-incremental marking only.
-  INLINE(void SetMark(HeapObject* obj));
+  INLINE(void SetMark(HeapObject* obj, MarkBit mark_bit));
 
   // Mark the heap roots and all objects reachable from them.
   void MarkRoots(RootMarkingVisitor<MarkCompactMode::FULL>* visitor);
 
   // Mark the string table specially.  References to internalized strings from
   // the string table are weak.
   void MarkStringTable(RootMarkingVisitor<MarkCompactMode::FULL>* visitor);
 
   // Mark objects reachable (transitively) from objects in the marking stack
   // or overflowed in the heap.
@@ skipping 169 matching lines @@
 
  private:
   MarkCompactCollector* collector_;
 };
 
 V8_EXPORT_PRIVATE const char* AllocationSpaceName(AllocationSpace space);
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_MARK_COMPACT_H_