Index: src/builtins/ppc/builtins-ppc.cc |
diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc |
index c0f5d299b750a46b5efdecb3b9af58fbc631d138..ca6cefcddf22587ba4d7d529ee80bdd29d4a50f2 100644 |
--- a/src/builtins/ppc/builtins-ppc.cc |
+++ b/src/builtins/ppc/builtins-ppc.cc |
@@ -1360,12 +1360,6 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
Register closure = r4; |
Register map = r9; |
Register index = r5; |
- |
- // Do we have a valid feedback vector? |
- __ LoadP(index, FieldMemOperand(closure, JSFunction::kLiteralsOffset)); |
- __ LoadP(index, FieldMemOperand(index, LiteralsArray::kFeedbackVectorOffset)); |
- __ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime); |
- |
__ LoadP(map, |
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset)); |
__ LoadP(map, |
@@ -1374,6 +1368,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ CmpSmiLiteral(index, Smi::FromInt(2), r0); |
__ blt(&gotta_call_runtime); |
+ // Find literals. |
// r10 : native context |
// r5 : length / index |
// r9 : optimized code map |
@@ -1394,6 +1389,18 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
__ cmp(temp, native_context); |
__ bne(&loop_bottom); |
+ // Literals available? |
+ __ LoadP(temp, |
+ FieldMemOperand(array_pointer, |
+ SharedFunctionInfo::kOffsetToPreviousLiterals)); |
+ __ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
+ __ JumpIfSmi(temp, &gotta_call_runtime); |
+ |
+ // Save the literals in the closure. |
+ __ StoreP(temp, FieldMemOperand(closure, JSFunction::kLiteralsOffset), r0); |
+ __ RecordWriteField(closure, JSFunction::kLiteralsOffset, temp, r7, |
+ kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET, |
+ OMIT_SMI_CHECK); |
// Code available? |
Register entry = r7; |
@@ -1403,7 +1410,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ LoadP(entry, FieldMemOperand(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. |
// Store code entry in the closure. |
__ addi(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ StoreP(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset), r0); |
@@ -1437,7 +1444,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ CmpSmiLiteral(index, Smi::FromInt(1), r0); |
__ bgt(&loop_top); |
- // We found no code. |
+ // We found neither literals nor code. |
__ b(&gotta_call_runtime); |
__ bind(&try_shared); |