Revert "Moved type feedback vector to SharedFunctionInfo."

src/compiler.cc

Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index 97f8e6f41ad40360c6dbdfd54f457444b1f6dc9f..fdee097b438e4d07bf20f2e350664d6c5a0df976 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -140,13 +140,6 @@ void CompilationInfo::Initialize(Isolate* isolate,
     SetStrictMode(shared_info_->strict_mode());
   }
   set_bailout_reason(kUnknown);
-
-  if (!shared_info().is_null() && shared_info()->is_compiled()) {
-    // We should initialize the CompilationInfo feedback vector from the
-    // passed in shared info, rather than creating a new one.
-    feedback_vector_ = Handle<FixedArray>(shared_info()->feedback_vector(),
-                                          isolate);
-  }
 }
 
 
@@ -256,20 +249,6 @@ void CompilationInfo::PrepareForCompilation(Scope* scope) {
   ASSERT(scope_ == NULL);
   scope_ = scope;
   function()->ProcessFeedbackSlots(isolate_);
-  int length = function()->slot_count();
-  if (feedback_vector_.is_null()) {
-    // Allocate the feedback vector too.
-    feedback_vector_ = isolate()->factory()->NewFixedArray(length, TENURED);
-    // Ensure we can skip the write barrier
-    ASSERT_EQ(isolate()->heap()->uninitialized_symbol(),
-              *TypeFeedbackInfo::UninitializedSentinel(isolate()));
-    for (int i = 0; i < length; i++) {
-      feedback_vector_->set(i,
-          *TypeFeedbackInfo::UninitializedSentinel(isolate()),
-          SKIP_WRITE_BARRIER);
-    }
-  }
-  ASSERT(feedback_vector_->length() == length);
 }
 
 
@@ -591,8 +570,6 @@ static void UpdateSharedFunctionInfo(CompilationInfo* info) {
   shared->ReplaceCode(*code);
   if (shared->optimization_disabled()) code->set_optimizable(false);
 
-  shared->set_feedback_vector(*info->feedback_vector());
-
   // Set the expected number of properties for instances.
   FunctionLiteral* lit = info->function();
   int expected = lit->expected_property_count();
@@ -846,8 +823,7 @@ static Handle<SharedFunctionInfo> CompileToplevel(CompilationInfo* info) {
         lit->materialized_literal_count(),
         lit->is_generator(),
         info->code(),
-        ScopeInfo::Create(info->scope(), info->zone()),
-        info->feedback_vector());
+        ScopeInfo::Create(info->scope(), info->zone()));
 
     ASSERT_EQ(RelocInfo::kNoPosition, lit->function_token_position());
     SetFunctionInfo(result, lit, true, script);
@@ -1046,8 +1022,7 @@ Handle<SharedFunctionInfo> Compiler::BuildFunctionInfo(FunctionLiteral* literal,
                                      literal->materialized_literal_count(),
                                      literal->is_generator(),
                                      info.code(),
-                                     scope_info,
-                                     info.feedback_vector());
+                                     scope_info);
   SetFunctionInfo(result, literal, false, script);
   RecordFunctionCompilation(Logger::FUNCTION_TAG, &info, result);
   result->set_allows_lazy_compilation(allow_lazy);