Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 272db157a86b5b4e8e787cd756b763cc8602b855..f445bf0cb4e7c9b81634c122bfdde85015a51a16 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -2130,12 +2130,12 @@ int LCodeGen::GetNextEmittedBlock() const { |
template<class InstrType> |
void LCodeGen::EmitBranch(InstrType instr, Condition cc) { |
- int right_block = instr->FalseDestination(chunk_); |
int left_block = instr->TrueDestination(chunk_); |
+ int right_block = instr->FalseDestination(chunk_); |
int next_block = GetNextEmittedBlock(); |
- if (right_block == left_block) { |
+ if (right_block == left_block || cc == al) { |
EmitGoto(left_block); |
} else if (left_block == next_block) { |
__ b(NegateCondition(cc), chunk_->GetAssemblyLabel(right_block)); |
@@ -2153,6 +2153,25 @@ void LCodeGen::DoDebugBreak(LDebugBreak* instr) { |
} |
+void LCodeGen::DoIsNumberAndBranch(LIsNumberAndBranch* instr) { |
+ Representation r = instr->hydrogen()->value()->representation(); |
+ if (r.IsSmiOrInteger32() || r.IsDouble()) { |
+ EmitBranch(instr, al); |
+ } else { |
+ ASSERT(r.IsTagged()); |
+ Register reg = ToRegister(instr->value()); |
+ HType type = instr->hydrogen()->value()->type(); |
+ if (type.IsTaggedNumber()) { |
+ EmitBranch(instr, al); |
+ } |
+ __ JumpIfSmi(reg, instr->TrueLabel(chunk_)); |
+ __ ldr(scratch0(), FieldMemOperand(reg, HeapObject::kMapOffset)); |
+ __ CompareRoot(scratch0(), Heap::kHeapNumberMapRootIndex); |
+ EmitBranch(instr, eq); |
+ } |
+} |
+ |
+ |
void LCodeGen::DoBranch(LBranch* instr) { |
Representation r = instr->hydrogen()->value()->representation(); |
if (r.IsInteger32() || r.IsSmi()) { |