Reland of Type Feedback Vector lives in the closure

src/compiler/bytecode-graph-builder.cc

Index: src/compiler/bytecode-graph-builder.cc
diff --git a/src/compiler/bytecode-graph-builder.cc b/src/compiler/bytecode-graph-builder.cc
index dec8194611fdd1b0c4534207928544575764d8e1..db8aa807b4e73096f4baa0769605373fa189a7cc 100644
--- a/src/compiler/bytecode-graph-builder.cc
+++ b/src/compiler/bytecode-graph-builder.cc
@@ -456,10 +456,10 @@ Node* BytecodeGraphBuilder::BuildLoadNativeContextField(int index) {
 Node* BytecodeGraphBuilder::BuildLoadFeedbackVector() {
   if (!feedback_vector_.is_set()) {
     Node* closure = GetFunctionClosure();
-    Node* shared = BuildLoadImmutableObjectField(
-        closure, JSFunction::kSharedFunctionInfoOffset);
+    Node* literals =
+        BuildLoadImmutableObjectField(closure, JSFunction::kLiteralsOffset);
     Node* vector = BuildLoadImmutableObjectField(
-        shared, SharedFunctionInfo::kFeedbackVectorOffset);
+        literals, LiteralsArray::kFeedbackVectorOffset);
     feedback_vector_.set(vector);
   }
   return feedback_vector_.get();
@@ -467,7 +467,8 @@ Node* BytecodeGraphBuilder::BuildLoadFeedbackVector() {
 
 
 VectorSlotPair BytecodeGraphBuilder::CreateVectorSlotPair(int slot_id) {
-  Handle<TypeFeedbackVector> feedback_vector = info()->feedback_vector();
+  Handle<TypeFeedbackVector> feedback_vector =
+      handle(info()->closure()->feedback_vector());
   FeedbackVectorSlot slot;
   if (slot_id >= TypeFeedbackVector::kReservedIndexCount) {
     slot = feedback_vector->ToSlot(slot_id);