Revert of Prepare for multiple ThreadHeaps

third_party/WebKit/Source/platform/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 231 matching lines @@
 namespace blink {
 
 class TestGCScope {
 public:
     explicit TestGCScope(BlinkGC::StackState state)
         : m_state(ThreadState::current())
         , m_safePointScope(state)
         , m_parkedAllThreads(false)
     {
         ASSERT(m_state->checkThread());
-        if (LIKELY(m_state->heap().park())) {
-            m_state->heap().preGC();
+        if (LIKELY(ThreadState::stopThreads())) {
+            ThreadHeap::preGC();
             m_parkedAllThreads = true;
         }
     }
 
     bool allThreadsParked() { return m_parkedAllThreads; }
 
     ~TestGCScope()
     {
         // Only cleanup if we parked all threads in which case the GC happened
         // and we need to resume the other threads.
         if (LIKELY(m_parkedAllThreads)) {
-            m_state->heap().postGC(BlinkGC::GCWithSweep);
-            m_state->heap().resume();
+            ThreadHeap::postGC(BlinkGC::GCWithSweep);
+            ThreadState::resumeThreads();
         }
     }
 
 private:
     ThreadState* m_state;
     SafePointScope m_safePointScope;
     bool m_parkedAllThreads; // False if we fail to park all threads
 };
 
 #define DEFINE_VISITOR_METHODS(Type)                               \
@@ skipping 135 matching lines @@
     DEFINE_INLINE_TRACE() { }
 private:
     static const int s_arraySize = 1000;
     int8_t m_array[s_arraySize];
 };
 
 // Do several GCs to make sure that later GCs don't free up old memory from
 // previously run tests in this process.
 static void clearOutOldGarbage()
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     while (true) {
-        size_t used = heap.objectPayloadSizeForTesting();
+        size_t used = ThreadHeap::objectPayloadSizeForTesting();
         preciselyCollectGarbage();
-        if (heap.objectPayloadSizeForTesting() >= used)
+        if (ThreadHeap::objectPayloadSizeForTesting() >= used)
             break;
     }
 }
 
 class OffHeapInt : public RefCounted<OffHeapInt> {
 public:
     static RefPtr<OffHeapInt> create(int x)
     {
         return adoptRef(new OffHeapInt(x));
     }
@@ skipping 81 matching lines @@
     using GlobalIntWrapperPersistent = CrossThreadPersistent<IntWrapper>;
 
     PassOwnPtr<GlobalIntWrapperPersistent> createGlobalPersistent(int value)
     {
         return adoptPtr(new GlobalIntWrapperPersistent(IntWrapper::create(value)));
     }
 
     void runThread() override
     {
         OwnPtr<GlobalIntWrapperPersistent> longLivingPersistent;
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         longLivingPersistent = createGlobalPersistent(0x2a2a2a2a);
         int gcCount = 0;
         while (!done()) {
             ThreadState::current()->safePoint(BlinkGC::NoHeapPointersOnStack);
             {
                 Persistent<IntWrapper> wrapper;
 
                 OwnPtr<GlobalIntWrapperPersistent> globalPersistent = createGlobalPersistent(0x0ed0cabb);
 
@@ skipping 23 matching lines @@
             SafePointScope scope(BlinkGC::NoHeapPointersOnStack);
             testing::yieldCurrentThread();
         }
 
         // Intentionally leak the cross-thread persistent so as to verify
         // that later GCs correctly handle cross-thread persistents that
         // refer to finalized objects after their heaps have been detached
         // and freed.
         EXPECT_TRUE(longLivingPersistent.leakPtr());
 
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
         atomicDecrement(&m_threadsToFinish);
     }
 };
 
 class ThreadedWeaknessTester : public ThreadedTesterBase {
 public:
     static void test()
     {
         ThreadedTesterBase::test(new ThreadedWeaknessTester);
     }
 
 private:
     void runThread() override
     {
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         int gcCount = 0;
         while (!done()) {
             ThreadState::current()->safePoint(BlinkGC::NoHeapPointersOnStack);
             {
                 Persistent<HeapHashMap<ThreadMarker, WeakMember<IntWrapper>>> weakMap = new HeapHashMap<ThreadMarker, WeakMember<IntWrapper>>;
                 PersistentHeapHashMap<ThreadMarker, WeakMember<IntWrapper>> weakMap2;
 
                 for (int i = 0; i < numberOfAllocations; i++) {
                     weakMap->add(static_cast<unsigned>(i), IntWrapper::create(0));
@@ skipping 12 matching lines @@
                 // TODO(haraken): This snapshot GC causes crashes, so disable
                 // it at the moment. Fix the crash and enable it.
                 // ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::TakeSnapshot, BlinkGC::ForcedGC);
                 preciselyCollectGarbage();
                 EXPECT_TRUE(weakMap->isEmpty());
                 EXPECT_TRUE(weakMap2.isEmpty());
             }
             SafePointScope scope(BlinkGC::NoHeapPointersOnStack);
             testing::yieldCurrentThread();
         }
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
         atomicDecrement(&m_threadsToFinish);
     }
 };
 
 class ThreadPersistentHeapTester : public ThreadedTesterBase {
 public:
     static void test()
     {
         ThreadedTesterBase::test(new ThreadPersistentHeapTester);
     }
@@ skipping 40 matching lines @@
         explicit PersistentChain(int count)
         {
             m_refCountedChain = adoptRef(RefCountedChain::create(count));
         }
 
         RefPtr<RefCountedChain> m_refCountedChain;
     };
 
     void runThread() override
     {
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         PersistentChain::create(100);
 
         // Upon thread detach, GCs will run until all persistents have been
         // released. We verify that the draining of persistents proceeds
         // as expected by dropping one Persistent<> per GC until there
         // are none left.
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
         atomicDecrement(&m_threadsToFinish);
     }
 };
 
 // The accounting for memory includes the memory used by rounding up object
 // sizes. This is done in a different way on 32 bit and 64 bit, so we have to
 // have some slack in the tests.
 template<typename T>
 void CheckWithSlack(T expected, T actual, int slack)
 {
@@ skipping 1087 matching lines @@
     ThreadedWeaknessTester::test();
 }
 
 TEST(HeapTest, ThreadPersistent)
 {
     ThreadPersistentHeapTester::test();
 }
 
 TEST(HeapTest, BasicFunctionality)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     clearOutOldGarbage();
-    size_t initialObjectPayloadSize = heap.objectPayloadSizeForTesting();
+    size_t initialObjectPayloadSize = ThreadHeap::objectPayloadSizeForTesting();
     {
         size_t slack = 0;
 
         // When the test starts there may already have been leaked some memory
         // on the heap, so we establish a base line.
         size_t baseLevel = initialObjectPayloadSize;
         bool testPagesAllocated = !baseLevel;
         if (testPagesAllocated)
-            EXPECT_EQ(heap.heapStats().allocatedSpace(), 0ul);
+            EXPECT_EQ(ThreadHeap::heapStats().allocatedSpace(), 0ul);
 
         // This allocates objects on the general heap which should add a page of memory.
         DynamicallySizedObject* alloc32 = DynamicallySizedObject::create(32);
         slack += 4;
         memset(alloc32, 40, 32);
         DynamicallySizedObject* alloc64 = DynamicallySizedObject::create(64);
         slack += 4;
         memset(alloc64, 27, 64);
 
         size_t total = 96;
 
-        CheckWithSlack(baseLevel + total, heap.objectPayloadSizeForTesting(), slack);
+        CheckWithSlack(baseLevel + total, ThreadHeap::objectPayloadSizeForTesting(), slack);
         if (testPagesAllocated)
-            EXPECT_EQ(heap.heapStats().allocatedSpace(), blinkPageSize * 2);
+            EXPECT_EQ(ThreadHeap::heapStats().allocatedSpace(), blinkPageSize * 2);
 
         EXPECT_EQ(alloc32->get(0), 40);
         EXPECT_EQ(alloc32->get(31), 40);
         EXPECT_EQ(alloc64->get(0), 27);
         EXPECT_EQ(alloc64->get(63), 27);
 
         conservativelyCollectGarbage();
 
         EXPECT_EQ(alloc32->get(0), 40);
         EXPECT_EQ(alloc32->get(31), 40);
         EXPECT_EQ(alloc64->get(0), 27);
         EXPECT_EQ(alloc64->get(63), 27);
     }
 
     clearOutOldGarbage();
     size_t total = 0;
     size_t slack = 0;
-    size_t baseLevel = heap.objectPayloadSizeForTesting();
+    size_t baseLevel = ThreadHeap::objectPayloadSizeForTesting();
     bool testPagesAllocated = !baseLevel;
     if (testPagesAllocated)
-        EXPECT_EQ(heap.heapStats().allocatedSpace(), 0ul);
+        EXPECT_EQ(ThreadHeap::heapStats().allocatedSpace(), 0ul);
 
     size_t big = 1008;
     Persistent<DynamicallySizedObject> bigArea = DynamicallySizedObject::create(big);
     total += big;
     slack += 4;
 
     size_t persistentCount = 0;
     const size_t numPersistents = 100000;
     Persistent<DynamicallySizedObject>* persistents[numPersistents];
 
     for (int i = 0; i < 1000; i++) {
         size_t size = 128 + i * 8;
         total += size;
         persistents[persistentCount++] = new Persistent<DynamicallySizedObject>(DynamicallySizedObject::create(size));
         slack += 4;
-        CheckWithSlack(baseLevel + total, heap.objectPayloadSizeForTesting(), slack);
+        CheckWithSlack(baseLevel + total, ThreadHeap::objectPayloadSizeForTesting(), slack);
         if (testPagesAllocated)
-            EXPECT_EQ(0ul, heap.heapStats().allocatedSpace() & (blinkPageSize - 1));
+            EXPECT_EQ(0ul, ThreadHeap::heapStats().allocatedSpace() & (blinkPageSize - 1));
     }
 
     {
         DynamicallySizedObject* alloc32b(DynamicallySizedObject::create(32));
         slack += 4;
         memset(alloc32b, 40, 32);
         DynamicallySizedObject* alloc64b(DynamicallySizedObject::create(64));
         slack += 4;
         memset(alloc64b, 27, 64);
         EXPECT_TRUE(alloc32b != alloc64b);
 
         total += 96;
-        CheckWithSlack(baseLevel + total, heap.objectPayloadSizeForTesting(), slack);
+        CheckWithSlack(baseLevel + total, ThreadHeap::objectPayloadSizeForTesting(), slack);
         if (testPagesAllocated)
-            EXPECT_EQ(0ul, heap.heapStats().allocatedSpace() & (blinkPageSize - 1));
+            EXPECT_EQ(0ul, ThreadHeap::heapStats().allocatedSpace() & (blinkPageSize - 1));
     }
 
     clearOutOldGarbage();
     total -= 96;
     slack -= 8;
     if (testPagesAllocated)
-        EXPECT_EQ(0ul, heap.heapStats().allocatedSpace() & (blinkPageSize - 1));
+        EXPECT_EQ(0ul, ThreadHeap::heapStats().allocatedSpace() & (blinkPageSize - 1));
 
     // Clear the persistent, so that the big area will be garbage collected.
     bigArea.release();
     clearOutOldGarbage();
 
     total -= big;
     slack -= 4;
-    CheckWithSlack(baseLevel + total, heap.objectPayloadSizeForTesting(), slack);
+    CheckWithSlack(baseLevel + total, ThreadHeap::objectPayloadSizeForTesting(), slack);
     if (testPagesAllocated)
-        EXPECT_EQ(0ul, heap.heapStats().allocatedSpace() & (blinkPageSize - 1));
+        EXPECT_EQ(0ul, ThreadHeap::heapStats().allocatedSpace() & (blinkPageSize - 1));
 
-    CheckWithSlack(baseLevel + total, heap.objectPayloadSizeForTesting(), slack);
+    CheckWithSlack(baseLevel + total, ThreadHeap::objectPayloadSizeForTesting(), slack);
     if (testPagesAllocated)
-        EXPECT_EQ(0ul, heap.heapStats().allocatedSpace() & (blinkPageSize - 1));
+        EXPECT_EQ(0ul, ThreadHeap::heapStats().allocatedSpace() & (blinkPageSize - 1));
 
     for (size_t i = 0; i < persistentCount; i++) {
         delete persistents[i];
         persistents[i] = 0;
     }
 
     uint8_t* address = reinterpret_cast<uint8_t*>(ThreadHeap::allocate<DynamicallySizedObject>(100));
     for (int i = 0; i < 100; i++)
         address[i] = i;
     address = reinterpret_cast<uint8_t*>(ThreadHeap::reallocate<DynamicallySizedObject>(address, 100000));
     for (int i = 0; i < 100; i++)
         EXPECT_EQ(address[i], i);
     address = reinterpret_cast<uint8_t*>(ThreadHeap::reallocate<DynamicallySizedObject>(address, 50));
     for (int i = 0; i < 50; i++)
         EXPECT_EQ(address[i], i);
     // This should be equivalent to free(address).
     EXPECT_EQ(reinterpret_cast<uintptr_t>(ThreadHeap::reallocate<DynamicallySizedObject>(address, 0)), 0ul);
     // This should be equivalent to malloc(0).
     EXPECT_EQ(reinterpret_cast<uintptr_t>(ThreadHeap::reallocate<DynamicallySizedObject>(0, 0)), 0ul);
 }
 
 TEST(HeapTest, SimpleAllocation)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     clearOutOldGarbage();
-    EXPECT_EQ(0ul, heap.objectPayloadSizeForTesting());
+    EXPECT_EQ(0ul, ThreadHeap::objectPayloadSizeForTesting());
 
     // Allocate an object in the heap.
     HeapAllocatedArray* array = new HeapAllocatedArray();
-    EXPECT_TRUE(heap.objectPayloadSizeForTesting() >= sizeof(HeapAllocatedArray));
+    EXPECT_TRUE(ThreadHeap::objectPayloadSizeForTesting() >= sizeof(HeapAllocatedArray));
 
     // Sanity check of the contents in the heap.
     EXPECT_EQ(0, array->at(0));
     EXPECT_EQ(42, array->at(42));
     EXPECT_EQ(0, array->at(128));
     EXPECT_EQ(999 % 128, array->at(999));
 }
 
 TEST(HeapTest, SimplePersistent)
 {
@@ skipping 307 matching lines @@
         // for the conservative stack scan to find.
         EXPECT_EQ(width, bars->getWidth());
     }
     EXPECT_EQ(Bars::width + 1, Bar::s_live);
     preciselyCollectGarbage();
     EXPECT_EQ(0u, Bar::s_live);
 }
 
 TEST(HeapTest, HashMapOfMembers)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     IntWrapper::s_destructorCalls = 0;
 
     clearOutOldGarbage();
-    size_t initialObjectPayloadSize = heap.objectPayloadSizeForTesting();
+    size_t initialObjectPayloadSize = ThreadHeap::objectPayloadSizeForTesting();
     {
         typedef HeapHashMap<
             Member<IntWrapper>,
             Member<IntWrapper>,
             DefaultHash<Member<IntWrapper>>::Hash,
             HashTraits<Member<IntWrapper>>,
             HashTraits<Member<IntWrapper>>> HeapObjectIdentityMap;
 
         Persistent<HeapObjectIdentityMap> map = new HeapObjectIdentityMap();
 
         map->clear();
-        size_t afterSetWasCreated = heap.objectPayloadSizeForTesting();
+        size_t afterSetWasCreated = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_TRUE(afterSetWasCreated > initialObjectPayloadSize);
 
         preciselyCollectGarbage();
-        size_t afterGC = heap.objectPayloadSizeForTesting();
+        size_t afterGC = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_EQ(afterGC, afterSetWasCreated);
 
         // If the additions below cause garbage collections, these
         // pointers should be found by conservative stack scanning.
         IntWrapper* one(IntWrapper::create(1));
         IntWrapper* anotherOne(IntWrapper::create(1));
 
         map->add(one, one);
 
-        size_t afterOneAdd = heap.objectPayloadSizeForTesting();
+        size_t afterOneAdd = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_TRUE(afterOneAdd > afterGC);
 
         HeapObjectIdentityMap::iterator it(map->begin());
         HeapObjectIdentityMap::iterator it2(map->begin());
         ++it;
         ++it2;
 
         map->add(anotherOne, one);
 
         // The addition above can cause an allocation of a new
         // backing store. We therefore garbage collect before
         // taking the heap stats in order to get rid of the old
         // backing store. We make sure to not use conservative
         // stack scanning as that could find a pointer to the
         // old backing.
         preciselyCollectGarbage();
-        size_t afterAddAndGC = heap.objectPayloadSizeForTesting();
+        size_t afterAddAndGC = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_TRUE(afterAddAndGC >= afterOneAdd);
 
         EXPECT_EQ(map->size(), 2u); // Two different wrappings of '1' are distinct.
 
         preciselyCollectGarbage();
         EXPECT_TRUE(map->contains(one));
         EXPECT_TRUE(map->contains(anotherOne));
 
         IntWrapper* gotten(map->get(one));
         EXPECT_EQ(gotten->value(), one->value());
         EXPECT_EQ(gotten, one);
 
-        size_t afterGC2 = heap.objectPayloadSizeForTesting();
+        size_t afterGC2 = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_EQ(afterGC2, afterAddAndGC);
 
         IntWrapper* dozen = 0;
 
         for (int i = 1; i < 1000; i++) { // 999 iterations.
             IntWrapper* iWrapper(IntWrapper::create(i));
             IntWrapper* iSquared(IntWrapper::create(i * i));
             map->add(iWrapper, iSquared);
             if (i == 12)
                 dozen = iWrapper;
         }
-        size_t afterAdding1000 = heap.objectPayloadSizeForTesting();
+        size_t afterAdding1000 = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_TRUE(afterAdding1000 > afterGC2);
 
         IntWrapper* gross(map->get(dozen));
         EXPECT_EQ(gross->value(), 144);
 
         // This should clear out any junk backings created by all the adds.
         preciselyCollectGarbage();
-        size_t afterGC3 = heap.objectPayloadSizeForTesting();
+        size_t afterGC3 = ThreadHeap::objectPayloadSizeForTesting();
         EXPECT_TRUE(afterGC3 <= afterAdding1000);
     }
 
     preciselyCollectGarbage();
     // The objects 'one', anotherOne, and the 999 other pairs.
     EXPECT_EQ(IntWrapper::s_destructorCalls, 2000);
-    size_t afterGC4 = heap.objectPayloadSizeForTesting();
+    size_t afterGC4 = ThreadHeap::objectPayloadSizeForTesting();
     EXPECT_EQ(afterGC4, initialObjectPayloadSize);
 }
 
 TEST(HeapTest, NestedAllocation)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     clearOutOldGarbage();
-    size_t initialObjectPayloadSize = heap.objectPayloadSizeForTesting();
+    size_t initialObjectPayloadSize = ThreadHeap::objectPayloadSizeForTesting();
     {
         Persistent<ConstructorAllocation> constructorAllocation = ConstructorAllocation::create();
     }
     clearOutOldGarbage();
-    size_t afterFree = heap.objectPayloadSizeForTesting();
+    size_t afterFree = ThreadHeap::objectPayloadSizeForTesting();
     EXPECT_TRUE(initialObjectPayloadSize == afterFree);
 }
 
 TEST(HeapTest, LargeHeapObjects)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     clearOutOldGarbage();
-    size_t initialObjectPayloadSize = heap.objectPayloadSizeForTesting();
-    size_t initialAllocatedSpace = heap.heapStats().allocatedSpace();
+    size_t initialObjectPayloadSize = ThreadHeap::objectPayloadSizeForTesting();
+    size_t initialAllocatedSpace = ThreadHeap::heapStats().allocatedSpace();
     IntWrapper::s_destructorCalls = 0;
     LargeHeapObject::s_destructorCalls = 0;
     {
         int slack = 8; // LargeHeapObject points to an IntWrapper that is also allocated.
         Persistent<LargeHeapObject> object = LargeHeapObject::create();
         ASSERT(ThreadState::current()->findPageFromAddress(object));
         ASSERT(ThreadState::current()->findPageFromAddress(reinterpret_cast<char*>(object.get()) + sizeof(LargeHeapObject) - 1));
         clearOutOldGarbage();
-        size_t afterAllocation = heap.heapStats().allocatedSpace();
+        size_t afterAllocation = ThreadHeap::heapStats().allocatedSpace();
         {
             object->set(0, 'a');
             EXPECT_EQ('a', object->get(0));
             object->set(object->length() - 1, 'b');
             EXPECT_EQ('b', object->get(object->length() - 1));
             size_t expectedLargeHeapObjectPayloadSize = ThreadHeap::allocationSizeFromSize(sizeof(LargeHeapObject));
             size_t expectedObjectPayloadSize = expectedLargeHeapObjectPayloadSize + sizeof(IntWrapper);
-            size_t actualObjectPayloadSize = heap.objectPayloadSizeForTesting() - initialObjectPayloadSize;
+            size_t actualObjectPayloadSize = ThreadHeap::objectPayloadSizeForTesting() - initialObjectPayloadSize;
             CheckWithSlack(expectedObjectPayloadSize, actualObjectPayloadSize, slack);
             // There is probably space for the IntWrapper in a heap page without
             // allocating extra pages. However, the IntWrapper allocation might cause
             // the addition of a heap page.
             size_t largeObjectAllocationSize = sizeof(LargeObjectPage) + expectedLargeHeapObjectPayloadSize;
             size_t allocatedSpaceLowerBound = initialAllocatedSpace + largeObjectAllocationSize;
             size_t allocatedSpaceUpperBound = allocatedSpaceLowerBound + slack + blinkPageSize;
             EXPECT_LE(allocatedSpaceLowerBound, afterAllocation);
             EXPECT_LE(afterAllocation, allocatedSpaceUpperBound);
             EXPECT_EQ(0, IntWrapper::s_destructorCalls);
             EXPECT_EQ(0, LargeHeapObject::s_destructorCalls);
             for (int i = 0; i < 10; i++)
                 object = LargeHeapObject::create();
         }
         clearOutOldGarbage();
-        EXPECT_TRUE(heap.heapStats().allocatedSpace() == afterAllocation);
+        EXPECT_TRUE(ThreadHeap::heapStats().allocatedSpace() == afterAllocation);
         EXPECT_EQ(10, IntWrapper::s_destructorCalls);
         EXPECT_EQ(10, LargeHeapObject::s_destructorCalls);
     }
     clearOutOldGarbage();
-    EXPECT_TRUE(initialObjectPayloadSize == heap.objectPayloadSizeForTesting());
-    EXPECT_TRUE(initialAllocatedSpace == heap.heapStats().allocatedSpace());
+    EXPECT_TRUE(initialObjectPayloadSize == ThreadHeap::objectPayloadSizeForTesting());
+    EXPECT_TRUE(initialAllocatedSpace == ThreadHeap::heapStats().allocatedSpace());
     EXPECT_EQ(11, IntWrapper::s_destructorCalls);
     EXPECT_EQ(11, LargeHeapObject::s_destructorCalls);
     preciselyCollectGarbage();
 }
 
 typedef std::pair<Member<IntWrapper>, int> PairWrappedUnwrapped;
 typedef std::pair<int, Member<IntWrapper>> PairUnwrappedWrapped;
 typedef std::pair<WeakMember<IntWrapper>, Member<IntWrapper>> PairWeakStrong;
 typedef std::pair<Member<IntWrapper>, WeakMember<IntWrapper>> PairStrongWeak;
 typedef std::pair<WeakMember<IntWrapper>, int> PairWeakUnwrapped;
@@ skipping 1368 matching lines @@
 {
     Persistent<Bar> barPersistent = Bar::create();
     Persistent<Foo> fooPersistent = Foo::create(barPersistent);
     EXPECT_TRUE(barPersistent != fooPersistent);
     barPersistent = fooPersistent;
     EXPECT_TRUE(barPersistent == fooPersistent);
 }
 
 TEST(HeapTest, CheckAndMarkPointer)
 {
-    ThreadHeap& heap = ThreadState::current()->heap();
     clearOutOldGarbage();
 
     Vector<Address> objectAddresses;
     Vector<Address> endAddresses;
     Address largeObjectAddress;
     Address largeObjectEndAddress;
     for (int i = 0; i < 10; i++) {
         SimpleObject* object = SimpleObject::create();
         Address objectAddress = reinterpret_cast<Address>(object);
         objectAddresses.append(objectAddress);
         endAddresses.append(objectAddress + sizeof(SimpleObject) - 1);
     }
     LargeHeapObject* largeObject = LargeHeapObject::create();
     largeObjectAddress = reinterpret_cast<Address>(largeObject);
     largeObjectEndAddress = largeObjectAddress + sizeof(LargeHeapObject) - 1;
 
     // This is a low-level test where we call checkAndMarkPointer. This method
     // causes the object start bitmap to be computed which requires the heap
     // to be in a consistent state (e.g. the free allocation area must be put
     // into a free list header). However when we call makeConsistentForGC it
     // also clears out the freelists so we have to rebuild those before trying
     // to allocate anything again. We do this by forcing a GC after doing the
     // checkAndMarkPointer tests.
     {
         TestGCScope scope(BlinkGC::HeapPointersOnStack);
         CountingVisitor visitor(ThreadState::current());
         EXPECT_TRUE(scope.allThreadsParked()); // Fail the test if we could not park all threads.
-        heap.flushHeapDoesNotContainCache();
+        ThreadHeap::flushHeapDoesNotContainCache();
         for (size_t i = 0; i < objectAddresses.size(); i++) {
-            EXPECT_TRUE(heap.checkAndMarkPointer(&visitor, objectAddresses[i]));
-            EXPECT_TRUE(heap.checkAndMarkPointer(&visitor, endAddresses[i]));
+            EXPECT_TRUE(ThreadHeap::checkAndMarkPointer(&visitor, objectAddresses[i]));
+            EXPECT_TRUE(ThreadHeap::checkAndMarkPointer(&visitor, endAddresses[i]));
         }
         EXPECT_EQ(objectAddresses.size() * 2, visitor.count());
         visitor.reset();
-        EXPECT_TRUE(heap.checkAndMarkPointer(&visitor, largeObjectAddress));
-        EXPECT_TRUE(heap.checkAndMarkPointer(&visitor, largeObjectEndAddress));
+        EXPECT_TRUE(ThreadHeap::checkAndMarkPointer(&visitor, largeObjectAddress));
+        EXPECT_TRUE(ThreadHeap::checkAndMarkPointer(&visitor, largeObjectEndAddress));
         EXPECT_EQ(2ul, visitor.count());
         visitor.reset();
     }
     // This forces a GC without stack scanning which results in the objects
     // being collected. This will also rebuild the above mentioned freelists,
     // however we don't rely on that below since we don't have any allocations.
     clearOutOldGarbage();
     {
         TestGCScope scope(BlinkGC::HeapPointersOnStack);
         CountingVisitor visitor(ThreadState::current());
         EXPECT_TRUE(scope.allThreadsParked());
-        heap.flushHeapDoesNotContainCache();
+        ThreadHeap::flushHeapDoesNotContainCache();
         for (size_t i = 0; i < objectAddresses.size(); i++) {
             // We would like to assert that checkAndMarkPointer returned false
             // here because the pointers no longer point into a valid object
             // (it's been freed by the GCs. But checkAndMarkPointer will return
             // true for any pointer that points into a heap page, regardless of
             // whether it points at a valid object (this ensures the
             // correctness of the page-based on-heap address caches), so we
             // can't make that assert.
-            heap.checkAndMarkPointer(&visitor, objectAddresses[i]);
-            heap.checkAndMarkPointer(&visitor, endAddresses[i]);
+            ThreadHeap::checkAndMarkPointer(&visitor, objectAddresses[i]);
+            ThreadHeap::checkAndMarkPointer(&visitor, endAddresses[i]);
         }
         EXPECT_EQ(0ul, visitor.count());
-        heap.checkAndMarkPointer(&visitor, largeObjectAddress);
-        heap.checkAndMarkPointer(&visitor, largeObjectEndAddress);
+        ThreadHeap::checkAndMarkPointer(&visitor, largeObjectAddress);
+        ThreadHeap::checkAndMarkPointer(&visitor, largeObjectEndAddress);
         EXPECT_EQ(0ul, visitor.count());
     }
     // This round of GC is important to make sure that the object start
     // bitmap are cleared out and that the free lists are rebuild.
     clearOutOldGarbage();
 }
 
 TEST(HeapTest, PersistentHeapCollectionTypes)
 {
     IntWrapper::s_destructorCalls = 0;
@@ skipping 848 matching lines @@
         {
             // Since the sleeper thread has detached this is the only thread.
             TestGCScope scope(BlinkGC::NoHeapPointersOnStack);
             EXPECT_TRUE(scope.allThreadsParked());
         }
     }
 
 private:
     static void sleeperMainFunc()
     {
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
         s_sleeperRunning = true;
 
         // Simulate a long running op that is not entering a safepoint.
         while (!s_sleeperDone) {
             testing::yieldCurrentThread();
         }
 
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
         s_sleeperRunning = false;
     }
 
     static volatile bool s_sleeperRunning;
     static volatile bool s_sleeperDone;
 };
 
 volatile bool GCParkingThreadTester::s_sleeperRunning = false;
 volatile bool GCParkingThreadTester::s_sleeperDone = false;
 
@@ skipping 656 matching lines @@
         // shutdown.
         wakeWorkerThread();
     }
 
 private:
 
     static void workerThreadMain()
     {
         MutexLocker locker(workerThreadMutex());
 
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         {
             // Create a worker object that is not kept alive except the
             // main thread will keep it as an integer value on its stack.
             IntWrapper* workerObject = IntWrapper::create(42);
             s_workerObjectPointer = reinterpret_cast<uintptr_t>(workerObject);
         }
 
         // Signal the main thread that the worker is done with its allocation.
         wakeMainThread();
 
         {
             // Wait for the main thread to do two GCs without sweeping this thread
             // heap. The worker waits within a safepoint, but there is no sweeping
             // until leaving the safepoint scope.
             SafePointScope scope(BlinkGC::NoHeapPointersOnStack);
             parkWorkerThread();
         }
 
         // Wake up the main thread when done sweeping.
         wakeMainThread();
 
         // Wait with detach until the main thread says so. This is not strictly
         // necessary, but it means the worker thread will not do its thread local
         // GCs just yet, making it easier to reason about that no new GC has occurred
         // and the above sweep was the one finalizing the worker object.
         parkWorkerThread();
 
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
     }
 
     static volatile uintptr_t s_workerObjectPointer;
 };
 
 volatile uintptr_t DeadBitTester::s_workerObjectPointer = 0;
 
 TEST(HeapTest, ObjectDeadBit)
 {
     DeadBitTester::test();
@@ skipping 71 matching lines @@
             parkWorkerThread();
         }
 
         return weakCollection;
     }
 
     static void workerThreadMain()
     {
         MutexLocker locker(workerThreadMutex());
 
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         {
             Persistent<WeakCollectionType> collection = allocateCollection();
             {
                 // Prevent weak processing with an iterator and GC.
                 WeakCollectionType::iterator it = collection->begin();
                 conservativelyCollectGarbage();
 
                 // The backing should be strongified because of the iterator.
                 EXPECT_EQ(6u, collection->size());
                 EXPECT_EQ(32, it->value->value());
             }
 
             // Disregarding the iterator but keeping the collection alive
             // with a persistent should lead to weak processing.
             preciselyCollectGarbage();
             EXPECT_EQ(0u, collection->size());
         }
 
         wakeMainThread();
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
     }
 
     static volatile uintptr_t s_workerObjectPointer;
 };
 
 TEST(HeapTest, ThreadedStrongification)
 {
     ThreadedStrongificationTester::test();
 }
 
@@ skipping 119 matching lines @@
         // can acquire it and do its sweep of its arenas. Just wait for the worker
         // to complete its sweep and check the result.
         parkMainThread();
         EXPECT_EQ(1, DestructorLockingObject::s_destructorCalls);
     }
 
 private:
     static void workerThreadMain()
     {
         MutexLocker locker(workerThreadMutex());
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
 
         DestructorLockingObject* dlo = DestructorLockingObject::create();
         ASSERT_UNUSED(dlo, dlo);
 
         // Wake up the main thread which is waiting for the worker to do its
         // allocation.
         wakeMainThread();
 
         // Wait for the main thread to get the global lock to ensure it has
         // it before the worker tries to acquire it. We want the worker to
         // block in the SafePointAwareMutexLocker until the main thread
         // has done a GC. The GC will not mark the "dlo" object since the worker
         // is entering the safepoint with NoHeapPointersOnStack. When the worker
         // subsequently gets the global lock and leaves the safepoint it will
         // sweep its heap and finalize "dlo". The destructor of "dlo" will try
         // to acquire the same global lock that the thread just got and deadlock
         // unless the global lock is recursive.
         parkWorkerThread();
         SafePointAwareMutexLocker recursiveLocker(recursiveMutex(), BlinkGC::NoHeapPointersOnStack);
 
         // We won't get here unless the lock is recursive since the sweep done
         // in the constructor of SafePointAwareMutexLocker after
         // getting the lock will not complete given the "dlo" destructor is
         // waiting to get the same lock.
         // Tell the main thread the worker has done its sweep.
         wakeMainThread();
 
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
     }
 
     static volatile IntWrapper* s_workerObjectPointer;
 };
 
 TEST(HeapTest, RecursiveMutex)
 {
     RecursiveLockingTester::test();
 }
 
@@ skipping 640 matching lines @@
     preciselyCollectGarbage();
     EXPECT_FALSE(holder->object());
 }
 
 namespace {
 
 void workerThreadMainForCrossThreadWeakPersistentTest(DestructorLockingObject** object)
 {
     // Step 2: Create an object and store the pointer.
     MutexLocker locker(workerThreadMutex());
-    ThreadState::attachCurrentThread();
+    ThreadState::attach();
     *object = DestructorLockingObject::create();
     wakeMainThread();
     parkWorkerThread();
 
     // Step 4: Run a GC.
     ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
     wakeMainThread();
     parkWorkerThread();
 
     // Step 6: Finish.
-    ThreadState::detachCurrentThread();
+    ThreadState::detach();
     wakeMainThread();
 }
 
 } // anonymous namespace
 
 TEST(HeapTest, CrossThreadWeakPersistent)
 {
     // Create an object in the worker thread, have a CrossThreadWeakPersistent pointing to it on the main thread,
     // clear the reference in the worker thread, run a GC in the worker thread, and see if the
     // CrossThreadWeakPersistent is cleared.
@@ skipping 92 matching lines @@
     static void test()
     {
         IntWrapper::s_destructorCalls = 0;
         ThreadedTesterBase::test(new ThreadedClearOnShutdownTester);
         EXPECT_EQ(numberOfThreads, IntWrapper::s_destructorCalls);
     }
 
 private:
     void runThread() override
     {
-        ThreadState::attachCurrentThread();
+        ThreadState::attach();
         EXPECT_EQ(42, threadSpecificIntWrapper().value());
-        ThreadState::detachCurrentThread();
+        ThreadState::detach();
         atomicDecrement(&m_threadsToFinish);
     }
 
     static IntWrapper& threadSpecificIntWrapper()
     {
         DEFINE_THREAD_SAFE_STATIC_LOCAL(
             ThreadSpecific<Persistent<IntWrapper>>, intWrapper,
             new ThreadSpecific<Persistent<IntWrapper>>);
         Persistent<IntWrapper>& handle = *intWrapper;
         if (!handle) {
@@ skipping 44 matching lines @@
         conservativelyCollectGarbage();
         EXPECT_EQ(wrapper, weakWrapper->value());
         // Stub out any stack reference.
         wrapper = nullptr;
     }
     preciselyCollectGarbage();
     EXPECT_EQ(nullptr, weakWrapper->value());
 }
 
 } // namespace blink