Index: src/builtins/x87/builtins-x87.cc |
diff --git a/src/builtins/x87/builtins-x87.cc b/src/builtins/x87/builtins-x87.cc |
index 4ac526e6a9168cf9dc75cbec86e632a39f3cf5eb..d635fdcd494fdeefb22b6acdc5071a5c6a234275 100644 |
--- a/src/builtins/x87/builtins-x87.cc |
+++ b/src/builtins/x87/builtins-x87.cc |
@@ -1028,12 +1028,6 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
Register new_target = edx; |
Register argument_count = eax; |
- // Do we have a valid feedback vector? |
- __ mov(ebx, FieldOperand(closure, JSFunction::kLiteralsOffset)); |
- __ mov(ebx, FieldOperand(ebx, LiteralsArray::kFeedbackVectorOffset)); |
- __ cmp(ebx, masm->isolate()->factory()->undefined_value()); |
- __ j(equal, &gotta_call_runtime_no_stack); |
- |
__ push(argument_count); |
__ push(new_target); |
__ push(closure); |
@@ -1046,6 +1040,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ cmp(index, Immediate(Smi::FromInt(2))); |
__ j(less, &gotta_call_runtime); |
+ // Find literals. |
// edx : native context |
// ebx : length / index |
// eax : optimized code map |
@@ -1063,6 +1058,20 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ mov(temp, FieldOperand(temp, WeakCell::kValueOffset)); |
__ cmp(temp, native_context); |
__ j(not_equal, &loop_bottom); |
+ // Literals available? |
+ __ mov(temp, FieldOperand(map, index, times_half_pointer_size, |
+ SharedFunctionInfo::kOffsetToPreviousLiterals)); |
+ __ mov(temp, FieldOperand(temp, WeakCell::kValueOffset)); |
+ __ JumpIfSmi(temp, &gotta_call_runtime); |
+ |
+ // Save the literals in the closure. |
+ __ mov(ecx, Operand(esp, 0)); |
+ __ mov(FieldOperand(ecx, JSFunction::kLiteralsOffset), temp); |
+ __ push(index); |
+ __ RecordWriteField(ecx, JSFunction::kLiteralsOffset, temp, index, |
+ kDontSaveFPRegs, EMIT_REMEMBERED_SET, OMIT_SMI_CHECK); |
+ __ pop(index); |
+ |
// Code available? |
Register entry = ecx; |
__ mov(entry, FieldOperand(map, index, times_half_pointer_size, |
@@ -1070,7 +1079,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ mov(entry, FieldOperand(entry, WeakCell::kValueOffset)); |
__ JumpIfSmi(entry, &try_shared); |
- // Found code. Get it into the closure and return. |
+ // Found literals and code. Get them into the closure and return. |
__ pop(closure); |
// Store code entry in the closure. |
__ lea(entry, FieldOperand(entry, Code::kHeaderSize)); |
@@ -1104,7 +1113,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ cmp(index, Immediate(Smi::FromInt(1))); |
__ j(greater, &loop_top); |
- // We found no code. |
+ // We found neither literals nor code. |
__ jmp(&gotta_call_runtime); |
__ bind(&try_shared); |