Oilpan: introduce eager finalization.

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 895 matching lines @@
                 TRACE_EVENT0("blink_gc", "ThreadState::invokePreFinalizers");
                 invokePreFinalizers(*Heap::s_markingVisitor);
             }
         }
 
         if (isMainThread())
             ScriptForbiddenScope::exit();
     }
 
 #if defined(ADDRESS_SANITIZER)
-// TODO(Oilpan): enable the poisoning always.
-#if ENABLE(OILPAN)
-    for (int i = 0; i < NumberOfHeaps; i++)
-        m_heaps[i]->poisonUnmarkedObjects();
-#endif
+    poisonEagerHeaps(true);
 #endif
 
 #if ENABLE(OILPAN)
     if (gcState() == EagerSweepScheduled) {
         // Eager sweeping should happen only in testing.
         setGCState(Sweeping);
+        eagerSweep();
+#if defined(ADDRESS_SANITIZER)
+        poisonHeapsForCompleteSweep();

[haraken, 2015/05/28 12:30:04]

poisonEagerHeaps => poisonEagerHeap
poisonHeapsForCompleteSweep => poisonAllHeaps

?

[sof, 2015/05/29 21:25:08]

Done.

+#endif
         completeSweep();
     } else {
         // The default behavior is lazy sweeping.
         setGCState(Sweeping);
         eagerSweep();
+#if defined(ADDRESS_SANITIZER)
+        poisonHeapsForCompleteSweep();
+#endif
         scheduleIdleLazySweep();
     }
 #else
     // FIXME: For now, we disable lazy sweeping in non-oilpan builds
     // to avoid unacceptable behavior regressions on trunk.
     setGCState(Sweeping);
     completeSweep();
 #endif
 
 #if ENABLE(GC_PROFILING)
     snapshotFreeListIfNecessary();
 #endif
 }
 
+#if defined(ADDRESS_SANITIZER)
+void ThreadState::poisonHeapsForCompleteSweep()
+{
+    // TODO(Oilpan): enable the poisoning always.
+#if ENABLE(OILPAN)
+    // Unpoison the live objects remaining in the eager heaps..
+    poisonEagerHeaps(false);
+    // ..along with poisoning all unmarked objects in the other heaps.
+    for (int i = 1; i < NumberOfHeaps; i++)
+        m_heaps[i]->poisonUnmarkedObjects();
+#endif
+}
+
+void ThreadState::poisonEagerHeaps(bool poisonOrNot)
+{
+    // TODO(Oilpan): enable the poisoning always.
+#if ENABLE(OILPAN)
+    m_heaps[EagerSweepHeapIndex]->poisonHeap(poisonOrNot);
+#endif
+}
+#endif
+
 void ThreadState::eagerSweep()
 {
     // Some objects need to be finalized promptly and cannot be handled
     // by lazy sweeping. Keep those in a designated heap and sweep it
     // eagerly.
     ASSERT(isSweepingInProgress());
 
     // Mirroring the completeSweep() condition; see its comment.
     if (sweepForbidden())
         return;
@@ skipping 23 matching lines @@
         return;
 
     ThreadState::SweepForbiddenScope scope(this);
     {
         if (isMainThread())
             ScriptForbiddenScope::enter();
 
         TRACE_EVENT0("blink_gc", "ThreadState::completeSweep");
         double timeStamp = WTF::currentTimeMS();
 
+        static_assert(EagerSweepHeapIndex == 0, "Eagerly swept heaps must be processed first.");
         for (int i = 0; i < NumberOfHeaps; i++)
             m_heaps[i]->completeSweep();
 
         Platform::current()->histogramCustomCounts("BlinkGC.CompleteSweep", WTF::currentTimeMS() - timeStamp, 0, 10 * 1000, 50);
 
         if (isMainThread())
             ScriptForbiddenScope::exit();
     }
 
     postSweep();
@@ skipping 349 matching lines @@
         json->beginArray(it->key.ascii().data());
         for (size_t age = 0; age <= maxHeapObjectAge; ++age)
             json->pushInteger(it->value.ages[age]);
         json->endArray();
     }
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), statsName, this, json.release());
 }
 #endif
 
 } // namespace blink