Remove ThreadState::m_isAtSafePoint

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 87 matching lines @@
   }
   return "<Unknown>";
 }
 
 ThreadState::ThreadState()
     : m_thread(currentThread()),
       m_persistentRegion(WTF::makeUnique<PersistentRegion>()),
       m_startOfStack(reinterpret_cast<intptr_t*>(WTF::getStackStart())),
       m_endOfStack(reinterpret_cast<intptr_t*>(WTF::getStackStart())),
       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_gcMixinMarker(nullptr),
       m_shouldFlushHeapDoesNotContainCache(false),
@@ skipping 978 matching lines @@
   for (int i = 0; i < BlinkGC::NumberOfArenas; ++i)
     objectPayloadSize += m_arenas[i]->objectPayloadSizeForTesting();
   return objectPayloadSize;
 }
 
 void ThreadState::safePoint(BlinkGC::StackState stackState) {
   ASSERT(checkThread());
   ThreadHeap::reportMemoryUsageForTracing();
 
   runScheduledGC(stackState);
-  ASSERT(!m_atSafePoint);
   m_stackState = BlinkGC::HeapPointersOnStack;
 }
 
 #ifdef ADDRESS_SANITIZER
 // When we are running under AddressSanitizer with
 // detect_stack_use_after_return=1 then stack marker obtained from
 // SafePointScope will point into a fake stack.  Detect this case by checking if
 // it falls in between current stack frame and stack start and use an arbitrary
 // high enough value for it.  Don't adjust stack marker in any other case to
 // match behavior of code running without AddressSanitizer.
@@ skipping 17 matching lines @@
 
 void ThreadState::enterSafePoint(BlinkGC::StackState stackState,
                                  void* scopeMarker) {
   ASSERT(checkThread());
 #ifdef ADDRESS_SANITIZER
   if (stackState == BlinkGC::HeapPointersOnStack)
     scopeMarker = adjustScopeMarkerForAdressSanitizer(scopeMarker);
 #endif
   ASSERT(stackState == BlinkGC::NoHeapPointersOnStack || scopeMarker);
   runScheduledGC(stackState);
-  ASSERT(!m_atSafePoint);
-  m_atSafePoint = true;
   m_stackState = stackState;
   m_safePointScopeMarker = scopeMarker;
   m_heap->enterSafePoint(this);
 }
 
 void ThreadState::leaveSafePoint() {
   ASSERT(checkThread());
-  ASSERT(m_atSafePoint);
   m_heap->leaveSafePoint();

[sof, 2017/02/15 09:00:04]

dead code.

[haraken, 2017/02/15 09:02:29]

yeah, let me remove this when I remove SafePointScope.

-  m_atSafePoint = false;
   m_stackState = BlinkGC::HeapPointersOnStack;
   clearSafePointScopeMarker();
 }
 
 void ThreadState::reportMemoryToV8() {
   if (!m_isolate)
     return;
 
   size_t currentHeapSize = m_allocatedObjectSize + m_markedObjectSize;
   int64_t diff = static_cast<int64_t>(currentHeapSize) -
@@ skipping 401 matching lines @@
     collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep,
                    BlinkGC::ForcedGC);
     size_t liveObjects = heap().heapStats().markedObjectSize();
     if (liveObjects == previousLiveObjects)
       break;
     previousLiveObjects = liveObjects;
   }
 }
 
 }  // namespace blink