| 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 9f788a5bfa8be5d3c359ff67d0e718aedb4d03ea..055363d87122c3d35f437325dd2379f68336db7e 100644
|
| --- a/src/compiler/arm/instruction-selector-arm.cc
|
| +++ b/src/compiler/arm/instruction-selector-arm.cc
|
| @@ -239,9 +239,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);
|
| }
|
|
|
|
|
| @@ -579,9 +578,8 @@ 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);
|
| }
|
|
|
|
|
| @@ -1103,8 +1101,7 @@ void VisitFloat64Compare(InstructionSelector* selector, Node* node,
|
| if (cont->IsBranch()) {
|
| selector->Emit(cont->Encode(kArmVcmpF64), g.NoOutput(),
|
| g.UseRegister(m.left().node()), rhs,
|
| - g.Label(cont->true_block()),
|
| - g.Label(cont->false_block()))->MarkAsControl();
|
| + g.Label(cont->true_block()), g.Label(cont->false_block()));
|
| } else {
|
| DCHECK(cont->IsSet());
|
| selector->Emit(cont->Encode(kArmVcmpF64),
|
| @@ -1151,9 +1148,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);
|
| }
|
|
|
|
|
| @@ -1258,8 +1254,7 @@ void VisitWordCompareZero(InstructionSelector* selector, Node* user,
|
| InstructionOperand const value_operand = g.UseRegister(value);
|
| if (cont->IsBranch()) {
|
| selector->Emit(opcode, g.NoOutput(), 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);
|
| @@ -1316,8 +1311,7 @@ void InstructionSelector::VisitSwitch(Node* node, BasicBlock* default_branch,
|
| DCHECK_LT(value + 2, input_count);
|
| inputs[value + 2] = g.Label(branch);
|
| }
|
| - Emit(kArchTableSwitch, 0, nullptr, input_count, inputs, 0, nullptr)
|
| - ->MarkAsControl();
|
| + Emit(kArchTableSwitch, 0, nullptr, input_count, inputs, 0, nullptr);
|
| return;
|
| }
|
|
|
| @@ -1332,8 +1326,7 @@ void InstructionSelector::VisitSwitch(Node* node, BasicBlock* default_branch,
|
| inputs[index * 2 + 2 + 0] = g.TempImmediate(value);
|
| inputs[index * 2 + 2 + 1] = g.Label(branch);
|
| }
|
| - Emit(kArchLookupSwitch, 0, nullptr, input_count, inputs, 0, nullptr)
|
| - ->MarkAsControl();
|
| + Emit(kArchLookupSwitch, 0, nullptr, input_count, inputs, 0, nullptr);
|
| }
|
|
|
|
|
|
|