| 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 ef9e89ed4efa71b7bbaa51aec1c649b8980d198c..d461e98d2b442732b1242e6eb962261cd4b03e4c 100644
|
| --- a/src/compiler/arm/instruction-selector-arm.cc
|
| +++ b/src/compiler/arm/instruction-selector-arm.cc
|
| @@ -238,9 +238,8 @@ void VisitBinop(InstructionSelector* selector, Node* node,
|
| DCHECK_GE(arraysize(outputs), output_count);
|
| DCHECK_NE(kMode_None, AddressingModeField::decode(opcode));
|
|
|
| - Instruction* instr = selector->Emit(cont->Encode(opcode), output_count,
|
| - outputs, input_count, inputs);
|
| - if (cont->IsBranch()) instr->MarkAsControl();
|
| + selector->Emit(cont->Encode(opcode), output_count, outputs, input_count,
|
| + inputs);
|
| }
|
|
|
|
|
| @@ -578,9 +577,8 @@ static inline void VisitShift(InstructionSelector* selector, Node* node,
|
| DCHECK_GE(arraysize(outputs), output_count);
|
| DCHECK_NE(kMode_None, AddressingModeField::decode(opcode));
|
|
|
| - Instruction* instr = selector->Emit(cont->Encode(opcode), output_count,
|
| - outputs, input_count, inputs);
|
| - if (cont->IsBranch()) instr->MarkAsControl();
|
| + selector->Emit(cont->Encode(opcode), output_count, outputs, input_count,
|
| + inputs);
|
| }
|
|
|
|
|
| @@ -1077,7 +1075,7 @@ void VisitFloat64Compare(InstructionSelector* selector, Node* node,
|
| selector->Emit(cont->Encode(kArmVcmpF64), nullptr,
|
| g.UseRegister(m.left().node()),
|
| g.UseRegister(m.right().node()), g.Label(cont->true_block()),
|
| - g.Label(cont->false_block()))->MarkAsControl();
|
| + g.Label(cont->false_block()));
|
| } else {
|
| DCHECK(cont->IsSet());
|
| selector->Emit(
|
| @@ -1124,9 +1122,8 @@ void VisitWordCompare(InstructionSelector* selector, Node* node,
|
| DCHECK_GE(arraysize(inputs), input_count);
|
| DCHECK_GE(arraysize(outputs), output_count);
|
|
|
| - Instruction* instr = selector->Emit(cont->Encode(opcode), output_count,
|
| - outputs, input_count, inputs);
|
| - if (cont->IsBranch()) instr->MarkAsControl();
|
| + selector->Emit(cont->Encode(opcode), output_count, outputs, input_count,
|
| + inputs);
|
| }
|
|
|
|
|
| @@ -1231,8 +1228,7 @@ void VisitWordCompareZero(InstructionSelector* selector, Node* user,
|
| InstructionOperand* const value_operand = g.UseRegister(value);
|
| if (cont->IsBranch()) {
|
| selector->Emit(opcode, nullptr, value_operand, value_operand,
|
| - g.Label(cont->true_block()),
|
| - g.Label(cont->false_block()))->MarkAsControl();
|
| + g.Label(cont->true_block()), g.Label(cont->false_block()));
|
| } else {
|
| selector->Emit(opcode, g.DefineAsRegister(cont->result()), value_operand,
|
| value_operand);
|
|
|