| Index: src/builtins/arm64/builtins-arm64.cc
|
| diff --git a/src/builtins/arm64/builtins-arm64.cc b/src/builtins/arm64/builtins-arm64.cc
|
| index 9051e08875d71a30a1e65798d9a261642ebe88b1..e1b4033a3d6aad422e9317f96f4717d2385da29d 100644
|
| --- a/src/builtins/arm64/builtins-arm64.cc
|
| +++ b/src/builtins/arm64/builtins-arm64.cc
|
| @@ -1350,14 +1350,19 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| Register closure = x1;
|
| Register map = x13;
|
| Register index = x2;
|
| +
|
| + // Do we have a valid feedback vector?
|
| + __ Ldr(index, FieldMemOperand(closure, JSFunction::kFeedbackVectorOffset));
|
| + __ Ldr(index, FieldMemOperand(index, Cell::kValueOffset));
|
| + __ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime);
|
| +
|
| __ Ldr(map, FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
|
| __ Ldr(map,
|
| FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
|
| __ Ldrsw(index, UntagSmiFieldMemOperand(map, FixedArray::kLengthOffset));
|
| __ Cmp(index, Operand(2));
|
| - __ B(lt, &gotta_call_runtime);
|
| + __ B(lt, &try_shared);
|
|
|
| - // Find literals.
|
| // x3 : native context
|
| // x2 : length / index
|
| // x13 : optimized code map
|
| @@ -1377,17 +1382,6 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| __ Ldr(temp, FieldMemOperand(temp, WeakCell::kValueOffset));
|
| __ Cmp(temp, native_context);
|
| __ B(ne, &loop_bottom);
|
| - // Feedback vector available?
|
| - __ Ldr(temp, FieldMemOperand(array_pointer,
|
| - SharedFunctionInfo::kOffsetToPreviousLiterals));
|
| - __ Ldr(temp, FieldMemOperand(temp, WeakCell::kValueOffset));
|
| - __ JumpIfSmi(temp, &gotta_call_runtime);
|
| -
|
| - // Save the feedback vector in the closure.
|
| - __ Str(temp, FieldMemOperand(closure, JSFunction::kFeedbackVectorOffset));
|
| - __ RecordWriteField(closure, JSFunction::kFeedbackVectorOffset, temp, x7,
|
| - kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET,
|
| - OMIT_SMI_CHECK);
|
|
|
| // Code available?
|
| Register entry = x7;
|
| @@ -1397,7 +1391,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| __ Ldr(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.
|
| __ Add(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ Str(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset));
|
| __ RecordWriteCodeEntryField(closure, entry, x5);
|
| @@ -1426,9 +1420,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| __ Cmp(index, Operand(1));
|
| __ B(gt, &loop_top);
|
|
|
| - // We found neither literals nor code.
|
| - __ B(&gotta_call_runtime);
|
| -
|
| + // We found no code.
|
| __ Bind(&try_shared);
|
| __ Ldr(entry,
|
| FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
|
|
|