Index: src/arm64/lithium-codegen-arm64.cc |
diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc |
index d885edd090a1d7f2db7d84f82873db5dd05ded6e..99f3b27d830077f8a431c1e5694108716cbb2f90 100644 |
--- a/src/arm64/lithium-codegen-arm64.cc |
+++ b/src/arm64/lithium-codegen-arm64.cc |
@@ -5715,7 +5715,8 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
Label* false_label = instr->FalseLabel(chunk_); |
Register value = ToRegister(instr->value()); |
- if (type_name->Equals(heap()->number_string())) { |
+ Factory* factory = isolate()->factory(); |
+ if (String::Equals(type_name, factory->number_string())) { |
ASSERT(instr->temp1() != NULL); |
Register map = ToRegister(instr->temp1()); |
@@ -5724,7 +5725,7 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
__ CompareRoot(map, Heap::kHeapNumberMapRootIndex); |
EmitBranch(instr, eq); |
- } else if (type_name->Equals(heap()->string_string())) { |
+ } else if (String::Equals(type_name, factory->string_string())) { |
ASSERT((instr->temp1() != NULL) && (instr->temp2() != NULL)); |
Register map = ToRegister(instr->temp1()); |
Register scratch = ToRegister(instr->temp2()); |
@@ -5735,7 +5736,7 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
__ Ldrb(scratch, FieldMemOperand(map, Map::kBitFieldOffset)); |
EmitTestAndBranch(instr, eq, scratch, 1 << Map::kIsUndetectable); |
- } else if (type_name->Equals(heap()->symbol_string())) { |
+ } else if (String::Equals(type_name, factory->symbol_string())) { |
ASSERT((instr->temp1() != NULL) && (instr->temp2() != NULL)); |
Register map = ToRegister(instr->temp1()); |
Register scratch = ToRegister(instr->temp2()); |
@@ -5744,16 +5745,17 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
__ CompareObjectType(value, map, scratch, SYMBOL_TYPE); |
EmitBranch(instr, eq); |
- } else if (type_name->Equals(heap()->boolean_string())) { |
+ } else if (String::Equals(type_name, factory->boolean_string())) { |
__ JumpIfRoot(value, Heap::kTrueValueRootIndex, true_label); |
__ CompareRoot(value, Heap::kFalseValueRootIndex); |
EmitBranch(instr, eq); |
- } else if (FLAG_harmony_typeof && type_name->Equals(heap()->null_string())) { |
+ } else if (FLAG_harmony_typeof && |
+ String::Equals(type_name, factory->null_string())) { |
__ CompareRoot(value, Heap::kNullValueRootIndex); |
EmitBranch(instr, eq); |
- } else if (type_name->Equals(heap()->undefined_string())) { |
+ } else if (String::Equals(type_name, factory->undefined_string())) { |
ASSERT(instr->temp1() != NULL); |
Register scratch = ToRegister(instr->temp1()); |
@@ -5764,7 +5766,7 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
__ Ldrb(scratch, FieldMemOperand(scratch, Map::kBitFieldOffset)); |
EmitTestAndBranch(instr, ne, scratch, 1 << Map::kIsUndetectable); |
- } else if (type_name->Equals(heap()->function_string())) { |
+ } else if (String::Equals(type_name, factory->function_string())) { |
STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2); |
ASSERT(instr->temp1() != NULL); |
Register type = ToRegister(instr->temp1()); |
@@ -5774,7 +5776,7 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) { |
// HeapObject's type has been loaded into type register by JumpIfObjectType. |
EmitCompareAndBranch(instr, eq, type, JS_FUNCTION_PROXY_TYPE); |
- } else if (type_name->Equals(heap()->object_string())) { |
+ } else if (String::Equals(type_name, factory->object_string())) { |
ASSERT((instr->temp1() != NULL) && (instr->temp2() != NULL)); |
Register map = ToRegister(instr->temp1()); |
Register scratch = ToRegister(instr->temp2()); |