Index: src/compiler/arm/instruction-selector-arm.cc |
diff --git a/src/compiler/arm/instruction-selector-arm.cc b/src/compiler/arm/instruction-selector-arm.cc |
index 73ea636e42c7b5a270f1016a58c6b294138b09ca..af55951f64e51831a4a119dcc1300527f8e374b9 100644 |
--- a/src/compiler/arm/instruction-selector-arm.cc |
+++ b/src/compiler/arm/instruction-selector-arm.cc |
@@ -1080,7 +1080,8 @@ void InstructionSelector::VisitFloat64RoundTiesAway(Node* node) { |
} |
-void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) { |
+void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, |
+ CallMode call_mode) { |
ArmOperandGenerator g(this); |
const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node); |
@@ -1112,14 +1113,15 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) { |
} |
// Select the appropriate opcode based on the call type. |
+ bool is_tail_call = call_mode == TAIL_CALL; |
InstructionCode opcode; |
switch (descriptor->kind()) { |
case CallDescriptor::kCallCodeObject: { |
- opcode = kArchCallCodeObject; |
+ opcode = is_tail_call ? kArchTailCallCodeObject : kArchCallCodeObject; |
break; |
} |
case CallDescriptor::kCallJSFunction: |
- opcode = kArchCallJSFunction; |
+ opcode = is_tail_call ? kArchTailCallJSFunction : kArchCallJSFunction; |
break; |
default: |
UNREACHABLE(); |
@@ -1128,11 +1130,12 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) { |
opcode |= MiscField::encode(flags); |
// Emit the call instruction. |
+ size_t size = is_tail_call ? 0 : buffer.outputs.size(); |
InstructionOperand* first_output = |
- buffer.outputs.size() > 0 ? &buffer.outputs.front() : NULL; |
+ size > 0 ? &buffer.outputs.front() : nullptr; |
Instruction* call_instr = |
- Emit(opcode, buffer.outputs.size(), first_output, |
- buffer.instruction_args.size(), &buffer.instruction_args.front()); |
+ Emit(opcode, size, first_output, buffer.instruction_args.size(), |
+ &buffer.instruction_args.front()); |
call_instr->MarkAsCall(); |
} |