Index: src/compiler/arm/code-generator-arm.cc |
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc |
index f278326cf7bbd52648a850aba271c11361b4e5cc..6f8859b1064738bf44104ff1e17a0e7faa9ca56d 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -193,7 +193,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
break; |
} |
case kArchJmp: |
- __ b(code_->GetLabel(i.InputBlock(0))); |
+ __ b(code_->GetLabel(i.InputRpo(0))); |
DCHECK_EQ(LeaveCC, i.OutputSBit()); |
break; |
case kArchNop: |
@@ -485,8 +485,10 @@ void CodeGenerator::AssembleArchBranch(Instruction* instr, |
// Emit a branch. The true and false targets are always the last two inputs |
// to the instruction. |
- BasicBlock* tblock = i.InputBlock(instr->InputCount() - 2); |
- BasicBlock* fblock = i.InputBlock(instr->InputCount() - 1); |
+ BasicBlock::RpoNumber tblock = |
+ i.InputRpo(static_cast<int>(instr->InputCount()) - 2); |
+ BasicBlock::RpoNumber fblock = |
+ i.InputRpo(static_cast<int>(instr->InputCount()) - 1); |
bool fallthru = IsNextInAssemblyOrder(fblock); |
Label* tlabel = code()->GetLabel(tblock); |
Label* flabel = fallthru ? &done : code()->GetLabel(fblock); |