Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index a1aa0220200d4309716ba5e6af46577036e180da..f3de5fd8b18d3b74e02c3ccafb746deefc08ecf4 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -138,6 +138,19 @@ void KeyedLoadFieldStub::InitializeInterfaceDescriptor( |
} |
+void KeyedArrayCallStub::InitializeInterfaceDescriptor( |
+ Isolate* isolate, |
+ CodeStubInterfaceDescriptor* descriptor) { |
+ static Register registers[] = { ecx }; |
+ 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) { |
@@ -5659,6 +5672,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(edi, eax); |
+ int parameter_count_offset = |
+ StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset; |
+ __ mov(eax, MemOperand(ebp, 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(eax, Immediate(1)); |
+ masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE); |
+ ParameterCount argument_count(eax); |
+ __ InvokeFunction( |
+ edi, argument_count, JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD); |
+} |
+ |
+ |
void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) { |
if (masm->isolate()->function_entry_hook() != NULL) { |
// It's always safe to call the entry hook stub, as the hook itself |