[object-stats] Fix duplicate entries

bug: v8:7266
Change-Id: I8241301c9652e70c88b35ebd057af107a1c05687
Reviewed-on: https://chromium-review.googlesource.com/880622Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50788}

src/heap/object-stats.cc

@@ -362,11 +362,11 @@ void ObjectStatsCollectorImpl::RecordVirtualJSObjectDetails(JSObject* object) {
   if (object->HasFastProperties()) {
     PropertyArray* properties = object->property_array();
     RecordSimpleVirtualObjectStats(object, properties,
-                                   ObjectStats::PROPERTY_ARRAY_TYPE);
+                                   ObjectStats::OBJECT_PROPERTY_ARRAY_TYPE);
   } else {
     NameDictionary* properties = object->property_dictionary();
-    RecordHashTableVirtualObjectStats(object, properties,
-                                      ObjectStats::PROPERTY_DICTIONARY_TYPE);
+    RecordHashTableVirtualObjectStats(
+        object, properties, ObjectStats::OBJECT_PROPERTY_DICTIONARY_TYPE);
   }
   // Elements.
   FixedArrayBase* elements = object->elements();

src/heap/object-stats.h

@@ -42,10 +42,10 @@
   V(NATIVE_CONTEXT_TYPE)                  \
   V(NOSCRIPT_SHARED_FUNCTION_INFOS_TYPE)  \
   V(NUMBER_STRING_CACHE_TYPE)             \
+  V(OBJECT_PROPERTY_ARRAY_TYPE)           \
+  V(OBJECT_PROPERTY_DICTIONARY_TYPE)      \
   V(OBJECT_TO_CODE_TYPE)                  \
   V(OTHER_CONTEXT_TYPE)                   \
-  V(PROPERTY_ARRAY_TYPE)                  \
-  V(PROPERTY_DICTIONARY_TYPE)             \
   V(PROTOTYPE_USERS_TYPE)                 \
   V(REGEXP_MULTIPLE_CACHE_TYPE)           \
   V(RETAINED_MAPS_TYPE)                   \

tools/heap-stats/categories.js

@@ -63,8 +63,8 @@ const CATEGORIES = new Map([
       'NATIVE_CONTEXT_TYPE',
       'ONE_BYTE_INTERNALIZED_STRING_TYPE',
       'ONE_BYTE_STRING_TYPE',
-      'PROPERTY_ARRAY_TYPE',
-      'PROPERTY_DICTIONARY_TYPE',
+      'OBJECT_PROPERTY_ARRAY_TYPE',
+      'OBJECT_PROPERTY_DICTIONARY_TYPE',
       'SHORT_EXTERNAL_INTERNALIZED_STRING_TYPE',
       'SHORT_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE',
       'SHORT_EXTERNAL_ONE_BYTE_STRING_TYPE',