Index: src/crankshaft/arm/lithium-codegen-arm.cc |
diff --git a/src/crankshaft/arm/lithium-codegen-arm.cc b/src/crankshaft/arm/lithium-codegen-arm.cc |
index c3b208989d2529b7c0d1b81b8ba515de6e5e6d39..24322ad8243b1d73656ec95684afe487798ef85e 100644 |
--- a/src/crankshaft/arm/lithium-codegen-arm.cc |
+++ b/src/crankshaft/arm/lithium-codegen-arm.cc |
@@ -3712,31 +3712,35 @@ void LCodeGen::DoCallJSFunction(LCallJSFunction* instr) { |
void LCodeGen::DoCallFunction(LCallFunction* instr) { |
+ HCallFunction* hinstr = instr->hydrogen(); |
DCHECK(ToRegister(instr->context()).is(cp)); |
DCHECK(ToRegister(instr->function()).is(r1)); |
DCHECK(ToRegister(instr->result()).is(r0)); |
int arity = instr->arity(); |
- ConvertReceiverMode mode = instr->hydrogen()->convert_mode(); |
- if (instr->hydrogen()->HasVectorAndSlot()) { |
+ ConvertReceiverMode mode = hinstr->convert_mode(); |
+ TailCallMode tail_call_mode = hinstr->tail_call_mode(); |
+ if (hinstr->HasVectorAndSlot()) { |
Register slot_register = ToRegister(instr->temp_slot()); |
Register vector_register = ToRegister(instr->temp_vector()); |
DCHECK(slot_register.is(r3)); |
DCHECK(vector_register.is(r2)); |
AllowDeferredHandleDereference vector_structure_check; |
- Handle<TypeFeedbackVector> vector = instr->hydrogen()->feedback_vector(); |
- int index = vector->GetIndex(instr->hydrogen()->slot()); |
+ Handle<TypeFeedbackVector> vector = hinstr->feedback_vector(); |
+ int index = vector->GetIndex(hinstr->slot()); |
__ Move(vector_register, vector); |
__ mov(slot_register, Operand(Smi::FromInt(index))); |
- Handle<Code> ic = |
- CodeFactory::CallICInOptimizedCode(isolate(), arity, mode).code(); |
+ Handle<Code> ic = CodeFactory::CallICInOptimizedCode(isolate(), arity, mode, |
+ tail_call_mode) |
+ .code(); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} else { |
__ mov(r0, Operand(arity)); |
- CallCode(isolate()->builtins()->Call(mode), RelocInfo::CODE_TARGET, instr); |
+ CallCode(isolate()->builtins()->Call(mode, tail_call_mode), |
+ RelocInfo::CODE_TARGET, instr); |
} |
} |