Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index dfbe37f6c73f8ed7921cc328fe6f0be4ccc87cd6..ef6bc84783756c394ab7294cedbe250d7f0faae9 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -4575,12 +4575,13 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
} |
PrepareForBailoutBeforeSplit(expr, true, if_true, if_false); |
- if (check->Equals(isolate()->heap()->number_string())) { |
+ Factory* factory = isolate()->factory(); |
+ if (String::Equals(check, factory->number_string())) { |
__ JumpIfSmi(v0, if_true); |
__ lw(v0, FieldMemOperand(v0, HeapObject::kMapOffset)); |
__ LoadRoot(at, Heap::kHeapNumberMapRootIndex); |
Split(eq, v0, Operand(at), if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->string_string())) { |
+ } else if (String::Equals(check, factory->string_string())) { |
__ JumpIfSmi(v0, if_false); |
// Check for undetectable objects => false. |
__ GetObjectType(v0, v0, a1); |
@@ -4589,20 +4590,20 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ And(a1, a1, Operand(1 << Map::kIsUndetectable)); |
Split(eq, a1, Operand(zero_reg), |
if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->symbol_string())) { |
+ } else if (String::Equals(check, factory->symbol_string())) { |
__ JumpIfSmi(v0, if_false); |
__ GetObjectType(v0, v0, a1); |
Split(eq, a1, Operand(SYMBOL_TYPE), if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->boolean_string())) { |
+ } else if (String::Equals(check, factory->boolean_string())) { |
__ LoadRoot(at, Heap::kTrueValueRootIndex); |
__ Branch(if_true, eq, v0, Operand(at)); |
__ LoadRoot(at, Heap::kFalseValueRootIndex); |
Split(eq, v0, Operand(at), if_true, if_false, fall_through); |
} else if (FLAG_harmony_typeof && |
- check->Equals(isolate()->heap()->null_string())) { |
+ String::Equals(check, factory->null_string())) { |
__ LoadRoot(at, Heap::kNullValueRootIndex); |
Split(eq, v0, Operand(at), if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->undefined_string())) { |
+ } else if (String::Equals(check, factory->undefined_string())) { |
__ LoadRoot(at, Heap::kUndefinedValueRootIndex); |
__ Branch(if_true, eq, v0, Operand(at)); |
__ JumpIfSmi(v0, if_false); |
@@ -4611,14 +4612,14 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ lbu(a1, FieldMemOperand(v0, Map::kBitFieldOffset)); |
__ And(a1, a1, Operand(1 << Map::kIsUndetectable)); |
Split(ne, a1, Operand(zero_reg), if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->function_string())) { |
+ } else if (String::Equals(check, factory->function_string())) { |
__ JumpIfSmi(v0, if_false); |
STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2); |
__ GetObjectType(v0, v0, a1); |
__ Branch(if_true, eq, a1, Operand(JS_FUNCTION_TYPE)); |
Split(eq, a1, Operand(JS_FUNCTION_PROXY_TYPE), |
if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->object_string())) { |
+ } else if (String::Equals(check, factory->object_string())) { |
__ JumpIfSmi(v0, if_false); |
if (!FLAG_harmony_typeof) { |
__ LoadRoot(at, Heap::kNullValueRootIndex); |