Index: src/ia32/lithium-ia32.cc |
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc |
index 799e077a330e37fa51443881bd67d402ca8cdd2a..040a4e6ddeede497b7b4966342cd8eca33aa548b 100644 |
--- a/src/ia32/lithium-ia32.cc |
+++ b/src/ia32/lithium-ia32.cc |
@@ -894,15 +894,15 @@ void LChunkBuilder::VisitInstruction(HInstruction* current) { |
if (FLAG_stress_environments && !instr->HasEnvironment()) { |
instr = AssignEnvironment(instr); |
} |
- if (current->IsBranch() && !instr->IsGoto()) { |
- // TODO(fschneider): Handle branch instructions uniformly like |
+ if (current->IsTest() && !instr->IsGoto()) { |
+ // TODO(fschneider): Handle test instructions uniformly like |
// other instructions. This requires us to generate the right |
// branch instruction already at the HIR level. |
ASSERT(instr->IsControl()); |
- HBranch* branch = HBranch::cast(current); |
- instr->set_hydrogen_value(branch->value()); |
- HBasicBlock* first = branch->FirstSuccessor(); |
- HBasicBlock* second = branch->SecondSuccessor(); |
+ HTest* test = HTest::cast(current); |
+ instr->set_hydrogen_value(test->value()); |
+ HBasicBlock* first = test->FirstSuccessor(); |
+ HBasicBlock* second = test->SecondSuccessor(); |
ASSERT(first != NULL && second != NULL); |
instr->SetBranchTargets(first->block_id(), second->block_id()); |
} else { |
@@ -959,7 +959,7 @@ LInstruction* LChunkBuilder::DoGoto(HGoto* instr) { |
} |
-LInstruction* LChunkBuilder::DoBranch(HBranch* instr) { |
+LInstruction* LChunkBuilder::DoTest(HTest* instr) { |
HValue* v = instr->value(); |
if (v->EmitAtUses()) { |
if (v->IsClassOfTest()) { |
@@ -1061,8 +1061,7 @@ LInstruction* LChunkBuilder::DoBranch(HBranch* instr) { |
} |
-LInstruction* LChunkBuilder::DoCompareMapAndBranch( |
- HCompareMapAndBranch* instr) { |
+LInstruction* LChunkBuilder::DoCompareMap(HCompareMap* instr) { |
ASSERT(instr->value()->representation().IsTagged()); |
LOperand* value = UseRegisterAtStart(instr->value()); |
return new LCmpMapAndBranch(value); |