Link type feedback vectors to the shared function info.

src/objects.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/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <memory>
 #include <sstream>
@@ skipping 12102 matching lines @@
 
   Cell* cell = function->feedback_vector_cell();
   if (cell == isolate->heap()->undefined_cell()) {
     if (FLAG_trace_strong_rooted_literals) {
       PrintF("EnsureLiterals: Installing literals cell in %s %p\n",
              shared->DebugName()->ToCString().get(),
              reinterpret_cast<void*>(*function));
     }
     // Top level code didn't get it's literals installed.
     Handle<FeedbackVector> feedback_vector =
-        FeedbackVector::New(isolate, handle(shared->feedback_metadata()));
+        FeedbackVector::New(isolate, shared);
     Handle<Cell> new_cell = isolate->factory()->NewCell(feedback_vector);
     function->set_feedback_vector_cell(*new_cell);
   } else if (!cell->value()->IsFeedbackVector() ||
              !function->has_feedback_vector()) {
     DCHECK(cell != isolate->heap()->undefined_cell());
     if (FLAG_trace_strong_rooted_literals) {
       PrintF("EnsureLiterals: Update literals cell in %s %p\n",
              shared->DebugName()->ToCString().get(),
              reinterpret_cast<void*>(*function));
     }
     Handle<FeedbackVector> feedback_vector =
-        FeedbackVector::New(isolate, handle(shared->feedback_metadata()));
+        FeedbackVector::New(isolate, shared);
     // Re-get the feedback_vector() value as GC may have occurred.
     function->feedback_vector_cell()->set_value(*feedback_vector);
   } else {
     if (FLAG_trace_strong_rooted_literals) {
       PrintF("EnsureLiterals: did nothing for %s %p\n",
              shared->DebugName()->ToCString().get(),
              reinterpret_cast<void*>(*function));
     }
   }
-
-  // No matter what, ensure some post-conditions.
-  DCHECK(shared->feedback_metadata()->slot_count() != 0 ||
-         function->feedback_vector() ==
-             shared->GetIsolate()->heap()->empty_feedback_vector());
 }
 
 static void GetMinInobjectSlack(Map* map, void* data) {
   int slack = map->unused_property_fields();
   if (*reinterpret_cast<int*>(data) > slack) {
     *reinterpret_cast<int*>(data) = slack;
   }
 }
 
 
@@ skipping 8048 matching lines @@
       // depend on this.
       return DICTIONARY_ELEMENTS;
     }
     DCHECK_LE(kind, LAST_ELEMENTS_KIND);
     return kind;
   }
 }
 
 }  // namespace internal
 }  // namespace v8