| Index: src/compiler/arm64/instruction-selector-arm64.cc
|
| diff --git a/src/compiler/arm64/instruction-selector-arm64.cc b/src/compiler/arm64/instruction-selector-arm64.cc
|
| index c6c47d76d8505b61fc34287ccb36217f049c5727..7f5014ee00feeafba038309f0fe41361c4c501d0 100644
|
| --- a/src/compiler/arm64/instruction-selector-arm64.cc
|
| +++ b/src/compiler/arm64/instruction-selector-arm64.cc
|
| @@ -249,9 +249,8 @@ static void VisitBinop(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);
|
| }
|
|
|
|
|
| @@ -1230,8 +1229,7 @@ static void VisitCompare(InstructionSelector* selector, InstructionCode opcode,
|
| opcode = cont->Encode(opcode);
|
| if (cont->IsBranch()) {
|
| selector->Emit(opcode, g.NoOutput(), left, right,
|
| - 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(opcode, g.DefineAsRegister(cont->result()), left, right);
|
| @@ -1410,8 +1408,7 @@ void InstructionSelector::VisitBranch(Node* branch, BasicBlock* tbranch,
|
| g.UseRegister(m.left().node()),
|
| g.TempImmediate(
|
| base::bits::CountTrailingZeros32(m.right().Value())),
|
| - g.Label(cont.true_block()),
|
| - g.Label(cont.false_block()))->MarkAsControl();
|
| + g.Label(cont.true_block()), g.Label(cont.false_block()));
|
| return;
|
| }
|
| return VisitWordCompare(this, value, kArm64Tst32, &cont, true,
|
| @@ -1428,8 +1425,7 @@ void InstructionSelector::VisitBranch(Node* branch, BasicBlock* tbranch,
|
| g.UseRegister(m.left().node()),
|
| g.TempImmediate(
|
| base::bits::CountTrailingZeros64(m.right().Value())),
|
| - g.Label(cont.true_block()),
|
| - g.Label(cont.false_block()))->MarkAsControl();
|
| + g.Label(cont.true_block()), g.Label(cont.false_block()));
|
| return;
|
| }
|
| return VisitWordCompare(this, value, kArm64Tst, &cont, true,
|
| @@ -1443,7 +1439,7 @@ void InstructionSelector::VisitBranch(Node* branch, BasicBlock* tbranch,
|
| // Branch could not be combined with a compare, compare against 0 and branch.
|
| Emit(cont.Encode(kArm64CompareAndBranch32), g.NoOutput(),
|
| g.UseRegister(value), g.Label(cont.true_block()),
|
| - g.Label(cont.false_block()))->MarkAsControl();
|
| + g.Label(cont.false_block()));
|
| }
|
|
|
|
|
| @@ -1487,8 +1483,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;
|
| }
|
|
|
| @@ -1503,8 +1498,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);
|
| }
|
|
|
|
|
|
|