Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1060)

Unified Diff: src/runtime/runtime-function.cc

Issue 1670813005: Revert of Type Feedback Vector lives in the closure (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime/runtime-compiler.cc ('k') | src/runtime/runtime-scopes.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime/runtime-function.cc
diff --git a/src/runtime/runtime-function.cc b/src/runtime/runtime-function.cc
index 10465e14ea5e1ca906fd20febcca9bc035b67d5e..e29b3c8c5f02f437934e42556e3dfa83029570ae 100644
--- a/src/runtime/runtime-function.cc
+++ b/src/runtime/runtime-function.cc
@@ -172,8 +172,7 @@
}
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(
@@ -192,13 +191,16 @@
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()) {
« no previous file with comments | « src/runtime/runtime-compiler.cc ('k') | src/runtime/runtime-scopes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698