Index: src/arm/lithium-arm.cc |
=================================================================== |
--- src/arm/lithium-arm.cc (revision 8931) |
+++ src/arm/lithium-arm.cc (working copy) |
@@ -1039,13 +1039,7 @@ |
: instr->SecondSuccessor(); |
return new LGoto(successor->block_id()); |
} |
- LInstruction* branch = new LBranch(UseRegister(v)); |
- // When we handle all cases, we never deopt, so we don't need to assign the |
- // environment then. Note that we map the "empty" case to the "all" case in |
- // the code generator. |
- ToBooleanStub::Types types = instr->expected_input_types(); |
- bool all_cases_handled = types.IsAll() || types.IsEmpty(); |
- return all_cases_handled ? branch : AssignEnvironment(branch); |
+ return AssignEnvironment(new LBranch(UseRegister(v))); |
} |
@@ -1515,19 +1509,13 @@ |
} |
-LInstruction* LChunkBuilder::DoExternalArrayLength( |
- HExternalArrayLength* instr) { |
+LInstruction* LChunkBuilder::DoFixedArrayBaseLength( |
+ HFixedArrayBaseLength* instr) { |
LOperand* array = UseRegisterAtStart(instr->value()); |
- return DefineAsRegister(new LExternalArrayLength(array)); |
+ return DefineAsRegister(new LFixedArrayBaseLength(array)); |
} |
-LInstruction* LChunkBuilder::DoFixedArrayLength(HFixedArrayLength* instr) { |
- LOperand* array = UseRegisterAtStart(instr->value()); |
- return DefineAsRegister(new LFixedArrayLength(array)); |
-} |
- |
- |
LInstruction* LChunkBuilder::DoElementsKind(HElementsKind* instr) { |
LOperand* object = UseRegisterAtStart(instr->value()); |
return DefineAsRegister(new LElementsKind(object)); |