Accurately measure current persistent count while running termination GC.

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 204 matching lines @@
 {
     if (isMainThread()) {
         cleanupPages();
         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.
     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) {
-        // Release the thread-local static persistents, including any
-        // that are instantiated while running the termination GCs.
+        ThreadHeap::collectGarbageForTerminatingThread(this);
+        // Release the thread-local static persistents that were
+        // instantiated while running the termination GC.
         releaseStaticPersistentNodes();
-        ThreadHeap::collectGarbageForTerminatingThread(this);
         oldCount = currentCount;
         currentCount = getPersistentRegion()->numberOfPersistents();
     }
     // We should not have any persistents left when getting to this point,
     // if we have it is probably a bug so adding a debug ASSERT to catch this.
     ASSERT(!currentCount);
     // All of pre-finalizers should be consumed.
     ASSERT(m_orderedPreFinalizers.isEmpty());
     RELEASE_ASSERT(gcState() == NoGCScheduled);
 
@@ skipping 1265 matching lines @@
     threadDump->addScalar("dead_count", "objects", totalDeadCount);
     threadDump->addScalar("live_size", "bytes", totalLiveSize);
     threadDump->addScalar("dead_size", "bytes", totalDeadSize);
 
     WebMemoryAllocatorDump* heapsDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(heapsDumpName);
     WebMemoryAllocatorDump* classesDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(classesDumpName);
     BlinkGCMemoryDumpProvider::instance()->currentProcessMemoryDump()->addOwnershipEdge(classesDump->guid(), heapsDump->guid());
 }
 
 } // namespace blink