Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index b021e46d3e9eb934beef823b6852ddf72601b983..5622c30d55ed10c0e308d2aed22809a6b07ad13a 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -4536,12 +4536,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(eax, if_true); |
__ cmp(FieldOperand(eax, HeapObject::kMapOffset), |
isolate()->factory()->heap_number_map()); |
Split(equal, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->string_string())) { |
+ } else if (String::Equals(check, factory->string_string())) { |
__ JumpIfSmi(eax, if_false); |
__ CmpObjectType(eax, FIRST_NONSTRING_TYPE, edx); |
__ j(above_equal, if_false); |
@@ -4549,20 +4550,20 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ test_b(FieldOperand(edx, Map::kBitFieldOffset), |
1 << Map::kIsUndetectable); |
Split(zero, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->symbol_string())) { |
+ } else if (String::Equals(check, factory->symbol_string())) { |
__ JumpIfSmi(eax, if_false); |
__ CmpObjectType(eax, SYMBOL_TYPE, edx); |
Split(equal, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->boolean_string())) { |
+ } else if (String::Equals(check, factory->boolean_string())) { |
__ cmp(eax, isolate()->factory()->true_value()); |
__ j(equal, if_true); |
__ cmp(eax, isolate()->factory()->false_value()); |
Split(equal, if_true, if_false, fall_through); |
} else if (FLAG_harmony_typeof && |
- check->Equals(isolate()->heap()->null_string())) { |
+ String::Equals(check, factory->null_string())) { |
__ cmp(eax, isolate()->factory()->null_value()); |
Split(equal, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->undefined_string())) { |
+ } else if (String::Equals(check, factory->undefined_string())) { |
__ cmp(eax, isolate()->factory()->undefined_value()); |
__ j(equal, if_true); |
__ JumpIfSmi(eax, if_false); |
@@ -4571,14 +4572,14 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ movzx_b(ecx, FieldOperand(edx, Map::kBitFieldOffset)); |
__ test(ecx, Immediate(1 << Map::kIsUndetectable)); |
Split(not_zero, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->function_string())) { |
+ } else if (String::Equals(check, factory->function_string())) { |
__ JumpIfSmi(eax, if_false); |
STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2); |
__ CmpObjectType(eax, JS_FUNCTION_TYPE, edx); |
__ j(equal, if_true); |
__ CmpInstanceType(edx, JS_FUNCTION_PROXY_TYPE); |
Split(equal, if_true, if_false, fall_through); |
- } else if (check->Equals(isolate()->heap()->object_string())) { |
+ } else if (String::Equals(check, factory->object_string())) { |
__ JumpIfSmi(eax, if_false); |
if (!FLAG_harmony_typeof) { |
__ cmp(eax, isolate()->factory()->null_value()); |