| Index: src/compiler/ia32/instruction-selector-ia32.cc
|
| diff --git a/src/compiler/ia32/instruction-selector-ia32.cc b/src/compiler/ia32/instruction-selector-ia32.cc
|
| index 72dd48e84438afe4c6fcdf79e3c20424f78b06f3..24817f4fe455ff197113143adee44932db64346d 100644
|
| --- a/src/compiler/ia32/instruction-selector-ia32.cc
|
| +++ b/src/compiler/ia32/instruction-selector-ia32.cc
|
| @@ -815,7 +815,8 @@ void InstructionSelector::VisitFloat64RoundTiesAway(Node* node) {
|
| }
|
|
|
|
|
| -void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) {
|
| +void InstructionSelector::VisitCall(Node* node, BasicBlock* handler,
|
| + CallMode call_mode) {
|
| IA32OperandGenerator g(this);
|
| const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node);
|
|
|
| @@ -849,14 +850,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();
|
| @@ -865,11 +867,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();
|
| }
|
|
|
|
|