Revert 168384 "Use OwnPtrs for heap contains cache and persisten..."

trunk/Source/heap/ThreadState.cpp

Index: trunk/Source/heap/ThreadState.cpp
===================================================================
--- trunk/Source/heap/ThreadState.cpp	(revision 168675)
+++ trunk/Source/heap/ThreadState.cpp	(working copy)
@@ -229,7 +229,6 @@
 
 ThreadState::ThreadState()
     : m_thread(currentThread())
-    , m_persistents(adoptPtr(new PersistentAnchor()))
     , m_startOfStack(reinterpret_cast<intptr_t*>(getStackStart()))
     , m_endOfStack(reinterpret_cast<intptr_t*>(getStackStart()))
     , m_safePointScopeMarker(0)
@@ -240,12 +239,13 @@
     , m_sweepInProgress(false)
     , m_noAllocationCount(0)
     , m_inGC(false)
-    , m_heapContainsCache(adoptPtr(new HeapContainsCache()))
+    , m_heapContainsCache(new HeapContainsCache())
     , m_isCleaningUp(false)
 {
     ASSERT(!**s_threadSpecific);
     **s_threadSpecific = this;
 
+    m_persistents = new PersistentAnchor();
     m_stats.clear();
     m_statsAfterLastGC.clear();
     // First allocate the general heap, second iterate through to
@@ -260,6 +260,8 @@
     checkThread();
     for (int i = GeneralHeap; i < NumberOfHeaps; i++)
         delete m_heaps[i];
+    delete m_persistents;
+    m_persistents = 0;
     deleteAllValues(m_interruptors);
     **s_threadSpecific = 0;
 }