| Index: runtime/vm/intermediate_language.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language.cc (revision 11303)
|
| +++ runtime/vm/intermediate_language.cc (working copy)
|
| @@ -557,7 +557,7 @@
|
| }
|
|
|
|
|
| -void BranchInstr::DiscoverBlocks(
|
| +void ControlInstruction::DiscoverBlocks(
|
| BlockEntryInstr* current_block,
|
| GrowableArray<BlockEntryInstr*>* preorder,
|
| GrowableArray<BlockEntryInstr*>* postorder,
|
| @@ -637,12 +637,12 @@
|
| }
|
|
|
|
|
| -intptr_t BranchInstr::SuccessorCount() const {
|
| +intptr_t ControlInstruction::SuccessorCount() const {
|
| return 2;
|
| }
|
|
|
|
|
| -BlockEntryInstr* BranchInstr::SuccessorAt(intptr_t index) const {
|
| +BlockEntryInstr* ControlInstruction::SuccessorAt(intptr_t index) const {
|
| if (index == 0) return true_successor_;
|
| if (index == 1) return false_successor_;
|
| UNREACHABLE();
|
| @@ -1226,8 +1226,8 @@
|
| }
|
|
|
|
|
| -void BranchInstr::EmitBranchOnCondition(FlowGraphCompiler* compiler,
|
| - Condition true_condition) {
|
| +void ControlInstruction::EmitBranchOnCondition(FlowGraphCompiler* compiler,
|
| + Condition true_condition) {
|
| if (compiler->IsNextBlock(false_successor())) {
|
| // If the next block is the false successor we will fall through to it.
|
| __ j(true_condition, compiler->GetBlockLabel(true_successor()));
|
|
|