| Index: src/compiler/ia32/code-generator-ia32.cc
|
| diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc
|
| index 454a02fa902190f2264abd2b0f5a5aa1d6a52f13..8543fd7849859b24364c489c9a097875099aef1b 100644
|
| --- a/src/compiler/ia32/code-generator-ia32.cc
|
| +++ b/src/compiler/ia32/code-generator-ia32.cc
|
| @@ -195,7 +195,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| break;
|
| }
|
| case kArchJmp:
|
| - __ jmp(code()->GetLabel(i.InputBlock(0)));
|
| + __ jmp(code()->GetLabel(i.InputRpo(0)));
|
| break;
|
| case kArchNop:
|
| // don't emit code for nops.
|
| @@ -470,8 +470,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);
|
|
|