Index: src/compiler/js-create-lowering.cc |
diff --git a/src/compiler/js-create-lowering.cc b/src/compiler/js-create-lowering.cc |
index 2662382ed2e6241a508ad3113be6da35c59ae8d7..84f0ac15aa81b648a8ce375b2ac654ccfcf621f8 100644 |
--- a/src/compiler/js-create-lowering.cc |
+++ b/src/compiler/js-create-lowering.cc |
@@ -751,20 +751,26 @@ Reduction JSCreateLowering::ReduceJSCreateClosure(Node* node) { |
DCHECK_EQ(IrOpcode::kJSCreateClosure, node->opcode()); |
CreateClosureParameters const& p = CreateClosureParametersOf(node->op()); |
Handle<SharedFunctionInfo> shared = p.shared_info(); |
- |
Node* effect = NodeProperties::GetEffectInput(node); |
Node* control = NodeProperties::GetControlInput(node); |
Node* context = NodeProperties::GetContextInput(node); |
+ |
int const function_map_index = |
Context::FunctionMapIndex(shared->language_mode(), shared->kind()); |
Node* function_map = jsgraph()->HeapConstant( |
handle(Map::cast(native_context()->get(function_map_index)), isolate())); |
+ |
+ FeedbackVectorSlot slot = p.feedback().slot(); |
+ Node* literals = jsgraph()->HeapConstant( |
+ handle(LiteralsArray::cast(p.feedback().vector()->Get(slot)), isolate())); |
+ |
// Note that it is only safe to embed the raw entry point of the compile |
// lazy stub into the code, because that stub is immortal and immovable. |
Node* compile_entry = jsgraph()->PointerConstant( |
jsgraph()->isolate()->builtins()->CompileLazy()->entry()); |
Node* empty_fixed_array = jsgraph()->EmptyFixedArrayConstant(); |
- Node* empty_literals_array = jsgraph()->EmptyLiteralsArrayConstant(); |
+ // TODO(mvstanton): With literals retrieved from the vector, we can |
Benedikt Meurer
2016/12/10 17:20:36
Do it :-)
mvstanton
2016/12/21 13:09:13
The CL is bursting at the seams, so I'll wait (but
|
+ // remove EmptyLiteralsArrayConstant() from jsgraph(). |
Node* the_hole = jsgraph()->TheHoleConstant(); |
Node* undefined = jsgraph()->UndefinedConstant(); |
AllocationBuilder a(jsgraph(), effect, control); |
@@ -773,7 +779,7 @@ Reduction JSCreateLowering::ReduceJSCreateClosure(Node* node) { |
a.Store(AccessBuilder::ForMap(), function_map); |
a.Store(AccessBuilder::ForJSObjectProperties(), empty_fixed_array); |
a.Store(AccessBuilder::ForJSObjectElements(), empty_fixed_array); |
- a.Store(AccessBuilder::ForJSFunctionLiterals(), empty_literals_array); |
+ a.Store(AccessBuilder::ForJSFunctionLiterals(), literals); |
a.Store(AccessBuilder::ForJSFunctionPrototypeOrInitialMap(), the_hole); |
a.Store(AccessBuilder::ForJSFunctionSharedFunctionInfo(), shared); |
a.Store(AccessBuilder::ForJSFunctionContext(), context); |