Index: src/builtins/mips64/builtins-mips64.cc |
diff --git a/src/builtins/mips64/builtins-mips64.cc b/src/builtins/mips64/builtins-mips64.cc |
index 32602ab148378fa1511f50d64542059f01a4daf6..a6961c20b30e42932279ec48fbdf61986142fd5f 100644 |
--- a/src/builtins/mips64/builtins-mips64.cc |
+++ b/src/builtins/mips64/builtins-mips64.cc |
@@ -1343,24 +1343,18 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
Register argument_count = a0; |
Register closure = a1; |
Register new_target = a3; |
- Register map = a0; |
- Register index = a2; |
- |
- // Do we have a valid feedback vector? |
- __ ld(index, FieldMemOperand(closure, JSFunction::kLiteralsOffset)); |
- __ ld(index, FieldMemOperand(index, LiteralsArray::kFeedbackVectorOffset)); |
- __ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, |
- &gotta_call_runtime_no_stack); |
- |
__ push(argument_count); |
__ push(new_target); |
__ push(closure); |
+ Register map = a0; |
+ Register index = a2; |
__ ld(map, FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset)); |
__ ld(map, FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset)); |
__ ld(index, FieldMemOperand(map, FixedArray::kLengthOffset)); |
__ Branch(&gotta_call_runtime, lt, index, Operand(Smi::FromInt(2))); |
+ // Find literals. |
// a3 : native context |
// a2 : length / index |
// a0 : optimized code map |
@@ -1380,6 +1374,20 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
SharedFunctionInfo::kOffsetToPreviousContext)); |
__ ld(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
__ Branch(&loop_bottom, ne, temp, Operand(native_context)); |
+ // Literals available? |
+ __ ld(temp, FieldMemOperand(array_pointer, |
+ SharedFunctionInfo::kOffsetToPreviousLiterals)); |
+ __ ld(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
+ __ JumpIfSmi(temp, &gotta_call_runtime); |
+ |
+ // Save the literals in the closure. |
+ __ ld(a4, MemOperand(sp, 0)); |
+ __ sd(temp, FieldMemOperand(a4, JSFunction::kLiteralsOffset)); |
+ __ push(index); |
+ __ RecordWriteField(a4, JSFunction::kLiteralsOffset, temp, index, |
+ kRAHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET, |
+ OMIT_SMI_CHECK); |
+ __ pop(index); |
// Code available? |
Register entry = a4; |
@@ -1389,7 +1397,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ ld(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. |
__ pop(closure); |
// Store code entry in the closure. |
__ Daddu(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
@@ -1424,7 +1432,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
Operand(Smi::FromInt(SharedFunctionInfo::kEntryLength))); |
__ Branch(&loop_top, gt, index, Operand(Smi::FromInt(1))); |
- // We found no code. |
+ // We found neither literals nor code. |
__ jmp(&gotta_call_runtime); |
__ bind(&try_shared); |