Remove prepareForThreadStateTermination()

third_party/WebKit/Source/platform/heap/ThreadState.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 135 matching lines @@
       m_safePointScopeMarker(nullptr),
       m_atSafePoint(false),
       m_interruptors(),
       m_sweepForbidden(false),
       m_noAllocationCount(0),
       m_gcForbiddenCount(0),
       m_mixinsBeingConstructedCount(0),
       m_accumulatedSweepingTime(0),
       m_vectorBackingArenaIndex(BlinkGC::Vector1ArenaIndex),
       m_currentArenaAges(0),
-      m_isTerminating(false),
       m_gcMixinMarker(nullptr),
       m_shouldFlushHeapDoesNotContainCache(false),
       m_gcState(NoGCScheduled),
       m_threadLocalWeakCallbackStack(CallbackStack::create()),
       m_isolate(nullptr),
       m_traceDOMWrappers(nullptr),
       m_invalidateDeadObjectsInWrappersMarkingDeque(nullptr),
 #if defined(ADDRESS_SANITIZER)
       m_asanFakeStack(__asan_get_current_fake_stack()),
 #endif
@@ skipping 50 matching lines @@
     removeAllPages();
     return;
   }
   ASSERT(checkThread());
 
   // Finish sweeping.
   completeSweep();
 
   releaseStaticPersistentNodes();
 
-  // From here on ignore all conservatively discovered
-  // pointers into the heap owned by this thread.
-  m_isTerminating = true;
-
-  // Set the terminate flag on all heap pages of this thread. This is used to
-  // ensure we don't trace pages on other threads that are not part of the
-  // thread local GC.
-  // TODO(haraken): Remove this. This is not needed once we remove a thread-
-  // local termination GC.
-  prepareForThreadStateTermination();
-
   ProcessHeap::crossThreadPersistentRegion().prepareForThreadStateTermination(
       this);
 
   // Do thread local GC's as long as the count of thread local Persistents
   // changes and is above zero.
   int oldCount = -1;
   int currentCount = getPersistentRegion()->numberOfPersistents();
   ASSERT(currentCount >= 0);
   while (currentCount != oldCount) {
     collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep,
@@ skipping 945 matching lines @@
       break;
     case SweepingAndIdleGCScheduled:
       setGCState(NoGCScheduled);
       scheduleIdleGC();
       break;
     default:
       ASSERT_NOT_REACHED();
   }
 }
 
-void ThreadState::prepareForThreadStateTermination() {
-  ASSERT(checkThread());
-  for (int i = 0; i < BlinkGC::NumberOfArenas; ++i)
-    m_arenas[i]->prepareHeapForTermination();
-}
-
 #if DCHECK_IS_ON()
 BasePage* ThreadState::findPageFromAddress(Address address) {
   for (int i = 0; i < BlinkGC::NumberOfArenas; ++i) {
     if (BasePage* page = m_arenas[i]->findPageFromAddress(address))
       return page;
   }
   return nullptr;
 }
 #endif
 
@@ skipping 524 matching lines @@
     collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep,
                    BlinkGC::ForcedGC);
     size_t liveObjects = heap().heapStats().markedObjectSize();
     if (liveObjects == previousLiveObjects)
       break;
     previousLiveObjects = liveObjects;
   }
 }
 
 }  // namespace blink