Revert of Type Feedback Vector lives in the closure

src/runtime/runtime-function.cc

 // Copyright 2014 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/runtime/runtime-utils.h"
 
 #include "src/accessors.h"
 #include "src/arguments.h"
 #include "src/compiler.h"
 #include "src/frames-inl.h"
@@ skipping 150 matching lines @@
   DCHECK(target_shared->code()->gc_metadata() == NULL);
   DCHECK(source_shared->code()->gc_metadata() == NULL);
   target_shared->set_dont_flush(true);
   source_shared->set_dont_flush(true);
 
   // Set the code, scope info, formal parameter count, and the length
   // of the target shared function info.
   target_shared->ReplaceCode(source_shared->code());
   target_shared->set_scope_info(source_shared->scope_info());
   target_shared->set_length(source_shared->length());
-  target_shared->set_feedback_metadata(source_shared->feedback_metadata());
-  target_shared->set_num_literals(source_shared->num_literals());
+  target_shared->set_feedback_vector(source_shared->feedback_vector());
   target_shared->set_internal_formal_parameter_count(
       source_shared->internal_formal_parameter_count());
   target_shared->set_start_position_and_type(
       source_shared->start_position_and_type());
   target_shared->set_end_position(source_shared->end_position());
   bool was_native = target_shared->native();
   target_shared->set_compiler_hints(source_shared->compiler_hints());
   target_shared->set_opt_count_and_bailout_reason(
       source_shared->opt_count_and_bailout_reason());
   target_shared->set_native(was_native);
   target_shared->set_profiler_ticks(source_shared->profiler_ticks());
   SharedFunctionInfo::SetScript(
       target_shared, Handle<Object>(source_shared->script(), isolate));
 
   // Set the code of the target function.
   target->ReplaceCode(source_shared->code());
   DCHECK(target->next_function_link()->IsUndefined());
 
+  // Make sure we get a fresh copy of the literal vector to avoid cross
+  // context contamination.
   Handle<Context> context(source->context());
   target->set_context(*context);
 
-  // Make sure we get a fresh copy of the literal vector to avoid cross
-  // context contamination, and that the literal vector makes it's way into
-  // the target_shared optimized code map.
-  JSFunction::EnsureLiterals(target);
+  int number_of_literals = source->NumberOfLiterals();
+  Handle<LiteralsArray> literals =
+      LiteralsArray::New(isolate, handle(target_shared->feedback_vector()),
+                         number_of_literals, TENURED);
+  target->set_literals(*literals);
 
   if (isolate->logger()->is_logging_code_events() ||
       isolate->cpu_profiler()->is_profiling()) {
     isolate->logger()->LogExistingFunction(source_shared,
                                            Handle<Code>(source_shared->code()));
   }
 
   return *target;
 }
 
@@ skipping 142 matching lines @@
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSReceiver, function, 0);
   return function->IsJSBoundFunction()
              ? *JSBoundFunction::ToString(
                    Handle<JSBoundFunction>::cast(function))
              : *JSFunction::ToString(Handle<JSFunction>::cast(function));
 }
 
 }  // namespace internal
 }  // namespace v8