Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 8db65bcfd481dbbb4185135a6e46617e6951a594..0fe6fa8825171a3b95a4fe5a2879c4af79c2f91c 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -133,6 +133,19 @@ void KeyedLoadFieldStub::InitializeInterfaceDescriptor( |
} |
+void KeyedArrayCallStub::InitializeInterfaceDescriptor( |
+ Isolate* isolate, |
+ CodeStubInterfaceDescriptor* descriptor) { |
+ static Register registers[] = { r2 }; |
+ descriptor->register_param_count_ = 1; |
+ descriptor->register_params_ = registers; |
+ descriptor->continuation_type_ = TAIL_CALL_CONTINUATION; |
+ descriptor->handler_arguments_mode_ = PASS_ARGUMENTS; |
+ descriptor->deoptimization_handler_ = |
+ FUNCTION_ADDR(KeyedCallIC_MissFromStubFailure); |
+} |
+ |
+ |
void KeyedStoreFastElementStub::InitializeInterfaceDescriptor( |
Isolate* isolate, |
CodeStubInterfaceDescriptor* descriptor) { |
@@ -5693,6 +5706,24 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) { |
} |
+void StubFailureTailCallTrampolineStub::Generate(MacroAssembler* masm) { |
+ CEntryStub ces(1, fp_registers_ ? kSaveFPRegs : kDontSaveFPRegs); |
+ __ Call(ces.GetCode(masm->isolate()), RelocInfo::CODE_TARGET); |
+ __ mov(r1, r0); |
+ int parameter_count_offset = |
+ StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset; |
+ __ ldr(r0, MemOperand(fp, parameter_count_offset)); |
+ // The parameter count above includes the receiver for the arguments passed to |
+ // the deoptimization handler. Subtract the receiver for the parameter count |
+ // for the call. |
+ __ sub(r0, r0, Operand(1)); |
+ masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE); |
+ ParameterCount argument_count(r0); |
+ __ InvokeFunction( |
+ r1, argument_count, JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD); |
+} |
+ |
+ |
void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) { |
if (masm->isolate()->function_entry_hook() != NULL) { |
PredictableCodeSizeScope predictable(masm, 4 * Assembler::kInstrSize); |