Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h

Index: third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
diff --git a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
index 99ac12e300c8915834446928196d9c6684a49882..cd2827bd57923cdf725cd422d8f5e47566a7e8d1 100644
--- a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
+++ b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
@@ -38,16 +38,19 @@ protected:
         if (header->isMarked())
             return;
 
-        ASSERT(ThreadState::current()->isInGC());
+        ASSERT(toDerived()->threadState()->isInGC());
+        if (toDerived()->threadState()->perThreadHeapEnabled())
+            RELEASE_ASSERT(ThreadState::forObject(objectPointer) == toDerived()->threadState());

[haraken, 2016/01/07 08:06:22]

forObject => fromObject

[haraken, 2016/01/07 08:06:22]

Hmm. This RELEASE_ASSERT would be a bit problematic for the following two
reasons:

- markHeader must be super fast to minimize GC's pause time. I want to avoid
introducing an if branch and the ASSERT.

- The ASSERT checks that a per-thread heap's GC doesn't trace into a
non-per-thread heap, but it doesn't check that a non-per-thread heap's GC
doesn't trace into a per-thread heap.

That said, I have no alternative idea at the moment. Let me think about it more.

 #if !defined(NDEBUG)
-        ASSERT(Heap::findPageFromAddress(header));
+        else
+            ASSERT(Heap::findPageFromAddress(header));
 #endif
         ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
 
         header->mark();
 
         if (callback)
-            Heap::pushTraceCallback(const_cast<void*>(objectPointer), callback);
+            Heap::pushTraceCallback(const_cast<void*>(objectPointer), callback, toDerived()->threadState());
     }
 
     inline void mark(const void* objectPointer, TraceCallback callback)
@@ -76,13 +79,13 @@ protected:
     inline void registerWeakTable(const void* closure, EphemeronCallback iterationCallback, EphemeronCallback iterationDoneCallback)
     {
         ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
-        Heap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
+        Heap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback, toDerived()->threadState());
     }
 
 #if ENABLE(ASSERT)
     inline bool weakTableRegistered(const void* closure)
     {
-        return Heap::weakTableRegistered(closure);
+        return Heap::weakTableRegistered(closure, toDerived()->threadState());
     }
 #endif
 
@@ -120,7 +123,7 @@ protected:
         // We don't want to run weak processings when taking a snapshot.
         if (toDerived()->markingMode() == Visitor::SnapshotMarking)
             return;
-        Heap::pushGlobalWeakCallback(cell, callback);
+        Heap::pushGlobalWeakCallback(cell, callback, toDerived()->threadState());
     }
 
 private: