Remove orphaned pages from Oilpan

third_party/WebKit/Source/platform/heap/Heap.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 188 matching lines @@
 void ThreadHeapStats::decreaseAllocatedSpace(size_t delta) {
   atomicSubtract(&m_allocatedSpace, static_cast<long>(delta));
   ProcessHeap::decreaseTotalAllocatedSpace(delta);
 }
 
 ThreadHeap::ThreadHeap()
     : m_regionTree(WTF::makeUnique<RegionTree>()),
       m_heapDoesNotContainCache(WTF::wrapUnique(new HeapDoesNotContainCache)),
       m_safePointBarrier(WTF::makeUnique<SafePointBarrier>()),
       m_freePagePool(WTF::wrapUnique(new FreePagePool)),
-      m_orphanedPagePool(WTF::wrapUnique(new OrphanedPagePool)),
       m_markingStack(CallbackStack::create()),
       m_postMarkingCallbackStack(CallbackStack::create()),
       m_globalWeakCallbackStack(CallbackStack::create()),
       m_ephemeronStack(CallbackStack::create()) {
   if (ThreadState::current()->isMainThread())
     s_mainThreadHeap = this;
 
   MutexLocker locker(ThreadHeap::allHeapsMutex());
   allHeaps().insert(this);
 }
@@ skipping 72 matching lines @@
 Address ThreadHeap::checkAndMarkPointer(Visitor* visitor, Address address) {
   ASSERT(ThreadState::current()->isInGC());
 
 #if !DCHECK_IS_ON()
   if (m_heapDoesNotContainCache->lookup(address))
     return nullptr;
 #endif
 
   if (BasePage* page = lookupPageForAddress(address)) {
     ASSERT(page->contains(address));
-    ASSERT(!page->orphaned());
     ASSERT(!m_heapDoesNotContainCache->lookup(address));
     DCHECK(&visitor->heap() == &page->arena()->getThreadState()->heap());
     page->checkAndMarkPointer(visitor, address);
     return address;
   }
 
 #if !DCHECK_IS_ON()
   m_heapDoesNotContainCache->addEntry(address);
 #else
   if (!m_heapDoesNotContainCache->lookup(address))
     m_heapDoesNotContainCache->addEntry(address);
 #endif
   return nullptr;
 }
 
 #if DCHECK_IS_ON()
 // To support unit testing of the marking of off-heap root references
 // into the heap, provide a checkAndMarkPointer() version with an
 // extra notification argument.
 Address ThreadHeap::checkAndMarkPointer(
     Visitor* visitor,
     Address address,
     MarkedPointerCallbackForTesting callback) {
   DCHECK(ThreadState::current()->isInGC());
 
   if (BasePage* page = lookupPageForAddress(address)) {
     DCHECK(page->contains(address));
-    DCHECK(!page->orphaned());
     DCHECK(!m_heapDoesNotContainCache->lookup(address));
     DCHECK(&visitor->heap() == &page->arena()->getThreadState()->heap());
     page->checkAndMarkPointer(visitor, address, callback);
     return address;
   }
   if (!m_heapDoesNotContainCache->lookup(address))
     m_heapDoesNotContainCache->addEntry(address);
   return nullptr;
 }
 #endif
 
 void ThreadHeap::pushTraceCallback(void* object, TraceCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  // Trace should never reach an orphaned page.
-  ASSERT(!getOrphanedPagePool()->contains(object));
   CallbackStack::Item* slot = m_markingStack->allocateEntry();
   *slot = CallbackStack::Item(object, callback);
 }
 
 bool ThreadHeap::popAndInvokeTraceCallback(Visitor* visitor) {
   CallbackStack::Item* item = m_markingStack->pop();
   if (!item)
     return false;
   item->call(visitor);
   return true;
 }
 
 void ThreadHeap::pushPostMarkingCallback(void* object, TraceCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  // Trace should never reach an orphaned page.
-  ASSERT(!getOrphanedPagePool()->contains(object));
   CallbackStack::Item* slot = m_postMarkingCallbackStack->allocateEntry();
   *slot = CallbackStack::Item(object, callback);
 }
 
 bool ThreadHeap::popAndInvokePostMarkingCallback(Visitor* visitor) {
   if (CallbackStack::Item* item = m_postMarkingCallbackStack->pop()) {
     item->call(visitor);
     return true;
   }
   return false;
 }
 
 void ThreadHeap::pushGlobalWeakCallback(void** cell, WeakCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  // Trace should never reach an orphaned page.
-  ASSERT(!getOrphanedPagePool()->contains(cell));
   CallbackStack::Item* slot = m_globalWeakCallbackStack->allocateEntry();
   *slot = CallbackStack::Item(cell, callback);
 }
 
 void ThreadHeap::pushThreadLocalWeakCallback(void* closure,
                                              void* object,
                                              WeakCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  // Trace should never reach an orphaned page.
-  ASSERT(!getOrphanedPagePool()->contains(object));
   ThreadState* state = pageFromObject(object)->arena()->getThreadState();
   state->pushThreadLocalWeakCallback(closure, callback);
 }
 
 bool ThreadHeap::popAndInvokeGlobalWeakCallback(Visitor* visitor) {
   if (CallbackStack::Item* item = m_globalWeakCallbackStack->pop()) {
     item->call(visitor);
     return true;
   }
   return false;
 }
 
 void ThreadHeap::registerWeakTable(void* table,
                                    EphemeronCallback iterationCallback,
                                    EphemeronCallback iterationDoneCallback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  // Trace should never reach an orphaned page.
-  ASSERT(!getOrphanedPagePool()->contains(table));
   CallbackStack::Item* slot = m_ephemeronStack->allocateEntry();
   *slot = CallbackStack::Item(table, iterationCallback);
 
   // Register a post-marking callback to tell the tables that
   // ephemeron iteration is complete.
   pushPostMarkingCallback(table, iterationDoneCallback);
 }
 
 #if DCHECK_IS_ON()
 bool ThreadHeap::weakTableRegistered(const void* table) {
@@ skipping 234 matching lines @@
 }
 
 void ThreadHeap::leaveSafePoint(ThreadState* threadState,
                                 SafePointAwareMutexLocker* locker) {
   m_safePointBarrier->leaveSafePoint(threadState, locker);
 }
 
 BasePage* ThreadHeap::lookupPageForAddress(Address address) {
   ASSERT(ThreadState::current()->isInGC());
   if (PageMemoryRegion* region = m_regionTree->lookup(address)) {
-    BasePage* page = region->pageFromAddress(address);
-    return page && !page->orphaned() ? page : nullptr;
+    return region->pageFromAddress(address);
   }
   return nullptr;
 }
 
 void ThreadHeap::resetHeapCounters() {
   ASSERT(ThreadState::current()->isInGC());
 
   ThreadHeap::reportMemoryUsageForTracing();
 
   ProcessHeap::decreaseTotalAllocatedObjectSize(m_stats.allocatedObjectSize());
   ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
 
   m_stats.reset();
   for (ThreadState* state : m_threads)
     state->resetHeapCounters();
 }
 
 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
 
 }  // namespace blink