[TypeFeedbackVector] Root feedback vectors at function literal site.

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/compilation-cache.h"
 #include "src/counters.h"
 #include "src/heap/heap-inl.h"
 #include "src/isolate.h"
@@ skipping 533 matching lines @@
   if (!feedback_metadata->is_empty()) {
     RecordFixedArrayHelper(sfi, feedback_metadata,
                            TYPE_FEEDBACK_METADATA_SUB_TYPE, 0);
   }
 
   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) {
-      Object* slot = optimized_code_map->get(
-          i + SharedFunctionInfo::kFeedbackVectorOffset);
-      TypeFeedbackVector* vector = nullptr;
-      if (slot->IsWeakCell()) {
-        WeakCell* cell = WeakCell::cast(slot);
-        if (!cell->cleared()) {
-          vector = TypeFeedbackVector::cast(cell->value());
-        }
-      } else {
-        vector = TypeFeedbackVector::cast(slot);
-      }
-      if (vector != nullptr) {
-        RecordFixedArrayHelper(sfi, vector, TYPE_FEEDBACK_VECTOR_SUB_TYPE, 0);
-      }
-    }
   }
 }
 
 void ObjectStatsCollector::RecordJSFunctionDetails(JSFunction* function) {
-  TypeFeedbackVector* feedback_vector = function->feedback_vector();
-  RecordFixedArrayHelper(function, feedback_vector,
-                         TYPE_FEEDBACK_VECTOR_SUB_TYPE, 0);
+  if (function->feedback_vector_cell()->value()->IsTypeFeedbackVector()) {
+    TypeFeedbackVector* feedback_vector = function->feedback_vector();
+    RecordFixedArrayHelper(function, feedback_vector,
+                           TYPE_FEEDBACK_VECTOR_SUB_TYPE, 0);
+  }
 }
 
 void ObjectStatsCollector::RecordFixedArrayDetails(FixedArray* array) {
   if (array->IsContext()) {
     RecordFixedArrayHelper(nullptr, array, CONTEXT_SUB_TYPE, 0);
   }
   if (IsCowArray(heap_, array) && CanRecordFixedArray(heap_, array)) {
     stats_->RecordFixedArraySubTypeStats(array, COPY_ON_WRITE_SUB_TYPE,
                                          array->Size(), 0);
   }
   if (array->IsNativeContext()) {
     Context* native_ctx = Context::cast(array);
     RecordHashTableHelper(array,
                           native_ctx->slow_template_instantiations_cache(),
                           SLOW_TEMPLATE_INSTANTIATIONS_CACHE_SUB_TYPE);
     FixedArray* fast_cache = native_ctx->fast_template_instantiations_cache();
     stats_->RecordFixedArraySubTypeStats(
         fast_cache, FAST_TEMPLATE_INSTANTIATIONS_CACHE_SUB_TYPE,
         fast_cache->Size(), 0);
   }
 }
 
 }  // namespace internal
 }  // namespace v8