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 ba21921dbb38c164f94df96c12074c93225fd7f2..ec2edbf58ef75a4d22cebfd190de578ccd0de023 100644 |
--- a/src/compiler/ia32/instruction-selector-ia32.cc |
+++ b/src/compiler/ia32/instruction-selector-ia32.cc |
@@ -375,9 +375,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); |
} |
@@ -823,8 +822,7 @@ void VisitCompare(InstructionSelector* selector, InstructionCode opcode, |
IA32OperandGenerator g(selector); |
if (cont->IsBranch()) { |
selector->Emit(cont->Encode(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()); |
// TODO(titzer): Needs byte register. |
@@ -889,7 +887,7 @@ void VisitWordCompare(InstructionSelector* selector, Node* node, |
InstructionCode opcode = cont->Encode(kIA32StackCheck); |
if (cont->IsBranch()) { |
selector->Emit(opcode, g.NoOutput(), 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())); |
@@ -1031,8 +1029,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; |
} |
@@ -1047,8 +1044,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); |
} |