Index: src/builtins/s390/builtins-s390.cc |
diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc |
index 672765d6756f6676d5b18dd1e2a4ec50e13b3473..20d47c07d7672d2e53744609d81ebefc1a7843b2 100644 |
--- a/src/builtins/s390/builtins-s390.cc |
+++ b/src/builtins/s390/builtins-s390.cc |
@@ -1366,6 +1366,12 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
Register closure = r3; |
Register map = r8; |
Register index = r4; |
+ |
+ // 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, |
@@ -1395,18 +1401,6 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset)); |
__ CmpP(temp, native_context); |
__ bne(&loop_bottom, Label::kNear); |
- // 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, r6, |
- kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET, |
- OMIT_SMI_CHECK); |
// Code available? |
Register entry = r6; |
@@ -1416,7 +1410,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ LoadP(entry, FieldMemOperand(entry, WeakCell::kValueOffset)); |
__ JumpIfSmi(entry, &try_shared); |
- // Found literals and code. Get them into the closure and return. |
+ // Found code. Get it into the closure and return. |
// Store code entry in the closure. |
__ AddP(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ StoreP(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset), r0); |
@@ -1450,7 +1444,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
__ CmpSmiLiteral(index, Smi::FromInt(1), r0); |
__ bgt(&loop_top); |
- // We found neither literals nor code. |
+ // We found no code. |
__ b(&gotta_call_runtime); |
__ bind(&try_shared); |