[heap] ObjectStats: Fix accounting for fixed array subtypes

src/heap/object-stats.h

 // Copyright 2015 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.
 
 #ifndef V8_HEAP_OBJECT_STATS_H_
 #define V8_HEAP_OBJECT_STATS_H_
 
+#include <set>
+
 #include "src/base/ieee754.h"
 #include "src/heap/heap.h"
 #include "src/heap/objects-visiting.h"
 #include "src/objects.h"
 
 namespace v8 {
 namespace internal {
 
 class ObjectStats {
  public:
@@ skipping 33 matching lines @@
            code_age_index < OBJECT_STATS_COUNT);
     object_counts_[code_sub_type_index]++;
     object_sizes_[code_sub_type_index] += size;
     object_counts_[code_age_index]++;
     object_sizes_[code_age_index] += size;
     const int idx = HistogramIndexFromSize(size);
     size_histogram_[code_sub_type_index][idx]++;
     size_histogram_[code_age_index][idx]++;
   }
 
-  void RecordFixedArraySubTypeStats(int array_sub_type, size_t size,
-                                    size_t over_allocated) {
+  void RecordFixedArraySubTypeStats(FixedArrayBase* array, int array_sub_type,
+                                    size_t size, size_t over_allocated) {
+    auto it = visited_fixed_array_sub_types_.insert(array);
+    if (!it.second) return;
     DCHECK(array_sub_type <= LAST_FIXED_ARRAY_SUB_TYPE);
     object_counts_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type]++;
     object_sizes_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type] += size;
     size_histogram_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type]
                    [HistogramIndexFromSize(size)]++;
     over_allocated_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type] +=
         over_allocated;
     over_allocated_histogram_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type]
                              [HistogramIndexFromSize(over_allocated)]++;
   }
@@ skipping 27 matching lines @@
   // Object counts and used memory by InstanceType.
   size_t object_counts_[OBJECT_STATS_COUNT];
   size_t object_counts_last_time_[OBJECT_STATS_COUNT];
   size_t object_sizes_[OBJECT_STATS_COUNT];
   size_t object_sizes_last_time_[OBJECT_STATS_COUNT];
   // Approximation of overallocated memory by InstanceType.
   size_t over_allocated_[OBJECT_STATS_COUNT];
   // Detailed histograms by InstanceType.
   size_t size_histogram_[OBJECT_STATS_COUNT][kNumberOfBuckets];
   size_t over_allocated_histogram_[OBJECT_STATS_COUNT][kNumberOfBuckets];
+
+  std::set<FixedArrayBase*> visited_fixed_array_sub_types_;
 };
 
 class ObjectStatsCollector {
  public:
   static void CollectStatistics(ObjectStats* stats, HeapObject* obj);
 
  private:
   static void RecordMapDetails(ObjectStats* stats, Heap* heap, HeapObject* obj);
   static void RecordCodeDetails(ObjectStats* stats, Heap* heap,
                                 HeapObject* obj);
   static void RecordSharedFunctionInfoDetails(ObjectStats* stats, Heap* heap,
                                               HeapObject* obj);
   static void RecordFixedArrayDetails(ObjectStats* stats, Heap* heap,
                                       HeapObject* obj);
 
   static void RecordJSObjectDetails(ObjectStats* stats, Heap* heap,
                                     JSObject* object);
   static void RecordJSWeakCollectionDetails(ObjectStats* stats, Heap* heap,
                                             JSWeakCollection* obj);
+  static void RecordScriptDetails(ObjectStats* stats, Heap* heap, Script* obj);
+
+  static void RecordFixedArrayHelper(ObjectStats* stats, Heap* heap,
+                                     HeapObject* parent, FixedArray* array,
+                                     int subtype, size_t overhead);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_OBJECT_STATS_H_