| 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 ee493cb75367f9b5077a262b439166383a4078a9..2a962e9fc317dbc67bb0185645e84d33db7630f4 100644
|
| --- a/src/compiler/arm64/instruction-selector-arm64.cc
|
| +++ b/src/compiler/arm64/instruction-selector-arm64.cc
|
| @@ -219,9 +219,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);
|
| }
|
|
|
|
|
| @@ -1163,7 +1162,7 @@ static void VisitCompare(InstructionSelector* selector, InstructionCode opcode,
|
| opcode = cont->Encode(opcode);
|
| if (cont->IsBranch()) {
|
| selector->Emit(opcode, NULL, left, right, g.Label(cont->true_block()),
|
| - g.Label(cont->false_block()))->MarkAsControl();
|
| + g.Label(cont->false_block()));
|
| } else {
|
| DCHECK(cont->IsSet());
|
| selector->Emit(opcode, g.DefineAsRegister(cont->result()), left, right);
|
| @@ -1351,8 +1350,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,
|
| @@ -1369,8 +1367,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,
|
| @@ -1383,8 +1380,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), NULL, g.UseRegister(value),
|
| - g.Label(cont.true_block()),
|
| - g.Label(cont.false_block()))->MarkAsControl();
|
| + g.Label(cont.true_block()), g.Label(cont.false_block()));
|
| }
|
|
|
|
|
|
|