| Index: src/mips/lithium-codegen-mips.cc
|
| diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
|
| index a2f94fa5d4bd94006d44705849b41228b7ee73da..ade50ac6e098765ab65353aa0eee655cfbe78ced 100644
|
| --- a/src/mips/lithium-codegen-mips.cc
|
| +++ b/src/mips/lithium-codegen-mips.cc
|
| @@ -1971,11 +1971,11 @@ int LCodeGen::GetNextEmittedBlock() const {
|
| template<class InstrType>
|
| void LCodeGen::EmitBranch(InstrType instr,
|
| Condition cc, Register src1, const Operand& src2) {
|
| - 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) {
|
| __ Branch(chunk_->GetAssemblyLabel(right_block),
|
| @@ -2015,6 +2015,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, zero_reg, Operand(zero_reg));
|
| + } else {
|
| + ASSERT(r.IsTagged());
|
| + Register reg = ToRegister(instr->value());
|
| + HType type = instr->hydrogen()->value()->type();
|
| + if (type.IsTaggedNumber()) {
|
| + EmitBranch(instr, al, zero_reg, Operand(zero_reg));
|
| + }
|
| + __ JumpIfSmi(reg, instr->TrueLabel(chunk_));
|
| + __ lw(scratch0(), FieldMemOperand(reg, HeapObject::kMapOffset));
|
| + __ LoadRoot(at, Heap::kHeapNumberMapRootIndex);
|
| + EmitBranch(instr, eq, scratch0(), Operand(at));
|
| + }
|
| +}
|
| +
|
| +
|
| void LCodeGen::DoBranch(LBranch* instr) {
|
| Representation r = instr->hydrogen()->value()->representation();
|
| if (r.IsInteger32() || r.IsSmi()) {
|
|
|