[heap] ObjectStats: Fixes for recording HashTable overhead

src/heap/object-stats.cc

 // 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.
 
 #include "src/heap/object-stats.h"
 
 #include "src/counters.h"
 #include "src/heap/heap-inl.h"
 #include "src/isolate.h"
 #include "src/macro-assembler.h"
@@ skipping 254 matching lines @@
             parent, FixedArray::cast(array->get(i)), subtype);
       }
     }
   }
 }
 
 template <class HashTable>
 void ObjectStatsCollector::RecordHashTableHelper(HeapObject* parent,
                                                  HashTable* array,
                                                  int subtype) {
-  int used = array->NumberOfElements() * HashTable::kEntrySize;
+  int used = array->NumberOfElements() * HashTable::kEntrySize * kPointerSize;
   CHECK_GE(array->Size(), used);
   size_t overhead = array->Size() - used -
                     HashTable::kElementsStartIndex * kPointerSize -
                     FixedArray::kHeaderSize;
   RecordFixedArrayHelper(parent, array, subtype, overhead);
 }
 
 void ObjectStatsCollector::RecordJSObjectDetails(JSObject* object) {
   size_t overhead = 0;
   FixedArrayBase* elements = object->elements();
@@ skipping 118 matching lines @@
 }
 
 void ObjectStatsCollector::RecordSharedFunctionInfoDetails(
     SharedFunctionInfo* sfi) {
   FixedArray* scope_info = sfi->scope_info();
   RecordFixedArrayHelper(sfi, scope_info, SCOPE_INFO_SUB_TYPE, 0);
   TypeFeedbackMetadata* feedback_metadata = sfi->feedback_metadata();
   if (!feedback_metadata->is_empty()) {
     RecordFixedArrayHelper(sfi, feedback_metadata,
                            TYPE_FEEDBACK_METADATA_SUB_TYPE, 0);
-    UnseededNumberDictionary* names = UnseededNumberDictionary::cast(
-        feedback_metadata->get(TypeFeedbackMetadata::kNamesTableIndex));
-    RecordHashTableHelper(sfi, names, TYPE_FEEDBACK_METADATA_SUB_TYPE);
+    Object* names =
+        feedback_metadata->get(TypeFeedbackMetadata::kNamesTableIndex);
+    if (!names->IsSmi()) {
+      UnseededNumberDictionary* names = UnseededNumberDictionary::cast(
+          feedback_metadata->get(TypeFeedbackMetadata::kNamesTableIndex));
+      RecordHashTableHelper(sfi, names, TYPE_FEEDBACK_METADATA_SUB_TYPE);
+    }
   }
 
   if (!sfi->OptimizedCodeMapIsCleared()) {
     FixedArray* optimized_code_map = sfi->optimized_code_map();
     RecordFixedArrayHelper(sfi, optimized_code_map, OPTIMIZED_CODE_MAP_SUB_TYPE,
                            0);
     // Optimized code map should be small, so skip accounting.
     int len = optimized_code_map->length();
     for (int i = SharedFunctionInfo::kEntriesStart; i < len;
          i += SharedFunctionInfo::kEntryLength) {
@@ skipping 34 matching lines @@
   }
   if (array->IsNativeContext()) {
     Context* native_ctx = Context::cast(array);
     RecordHashTableHelper(array, native_ctx->template_instantiations_cache(),
                           TEMPLATE_INSTANTIATIONS_CACHE_SUB_TYPE);
   }
 }
 
 }  // namespace internal
 }  // namespace v8