[heap] ObjectStats: Cleanup and more FIXED_ARRAY sub types

src/heap/mark-compact.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/mark-compact.h"
 
 #include "src/base/atomicops.h"
 #include "src/base/bits.h"
 #include "src/base/sys-info.h"
 #include "src/code-stubs.h"
@@ skipping 2212 matching lines @@
   DCHECK(in_use());
   HeapObject* heap_object = HeapObject::cast(*object);
   DCHECK(heap_->Contains(heap_object));
   MarkBit mark_bit = ObjectMarking::MarkBitFrom(heap_object);
   MarkObject(heap_object, mark_bit);
 }
 
 class MarkCompactCollector::ObjectStatsVisitor
     : public MarkCompactCollector::HeapObjectVisitor {
  public:
-  ObjectStatsVisitor(ObjectStats* live_stats, ObjectStats* dead_stats)
-      : live_stats_(live_stats), dead_stats_(dead_stats) {
-    DCHECK_NOT_NULL(live_stats_);
-    DCHECK_NOT_NULL(dead_stats_);
+  ObjectStatsVisitor(Heap* heap, ObjectStats* live_stats,
+                     ObjectStats* dead_stats)
+      : live_collector_(heap, live_stats), dead_collector_(heap, dead_stats) {
+    DCHECK_NOT_NULL(live_stats);
+    DCHECK_NOT_NULL(dead_stats);
+    // Global objects are roots and thus recorded as live.
+    live_collector_.CollectGlobalStatistics();
   }
 
   bool Visit(HeapObject* obj) override {
     if (Marking::IsBlack(ObjectMarking::MarkBitFrom(obj))) {
-      ObjectStatsCollector::CollectStatistics(live_stats_, obj);
+      live_collector_.CollectStatistics(obj);
     } else {
       DCHECK(!Marking::IsGrey(ObjectMarking::MarkBitFrom(obj)));
-      ObjectStatsCollector::CollectStatistics(dead_stats_, obj);
+      dead_collector_.CollectStatistics(obj);
     }
     return true;
   }
 
  private:
-  ObjectStats* live_stats_;
-  ObjectStats* dead_stats_;
+  ObjectStatsCollector live_collector_;
+  ObjectStatsCollector dead_collector_;
 };
 
 void MarkCompactCollector::VisitAllObjects(HeapObjectVisitor* visitor) {
   SpaceIterator space_it(heap());
   HeapObject* obj = nullptr;
   while (space_it.has_next()) {
     ObjectIterator* it = space_it.next();
     while ((obj = it->Next()) != nullptr) {
       visitor->Visit(obj);
     }
   }
 }
 
 void MarkCompactCollector::RecordObjectStats() {
   if (FLAG_track_gc_object_stats) {
-    ObjectStatsVisitor visitor(heap()->live_object_stats_,
+    ObjectStatsVisitor visitor(heap(), heap()->live_object_stats_,
                                heap()->dead_object_stats_);
     VisitAllObjects(&visitor);
     if (FLAG_trace_gc_object_stats) {
       heap()->live_object_stats_->PrintJSON("live");
       heap()->dead_object_stats_->PrintJSON("dead");
     }
     heap()->live_object_stats_->CheckpointObjectStats();
     heap()->dead_object_stats_->ClearObjectStats();
   }
 }
@@ skipping 1760 matching lines @@
       // The target is always in old space, we don't have to record the slot in
       // the old-to-new remembered set.
       DCHECK(!heap()->InNewSpace(target));
       RecordRelocSlot(host, &rinfo, target);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8