| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index 66c4a5ce9eeecc492ffad7f04e088e59f1fd3c0d..ebd430c788b587ac5144414d42fc8d7be099becf 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -6094,13 +6094,13 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) {
|
| Label::Distance false_distance = right_block == next_block ? Label::kNear
|
| : Label::kFar;
|
| Condition final_branch_condition = no_condition;
|
| - if (type_name->Equals(heap()->number_string())) {
|
| + if (String::Equals(type_name, factory()->number_string())) {
|
| __ JumpIfSmi(input, true_label, true_distance);
|
| __ cmp(FieldOperand(input, HeapObject::kMapOffset),
|
| factory()->heap_number_map());
|
| final_branch_condition = equal;
|
|
|
| - } else if (type_name->Equals(heap()->string_string())) {
|
| + } else if (String::Equals(type_name, factory()->string_string())) {
|
| __ JumpIfSmi(input, false_label, false_distance);
|
| __ CmpObjectType(input, FIRST_NONSTRING_TYPE, input);
|
| __ j(above_equal, false_label, false_distance);
|
| @@ -6108,22 +6108,23 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) {
|
| 1 << Map::kIsUndetectable);
|
| final_branch_condition = zero;
|
|
|
| - } else if (type_name->Equals(heap()->symbol_string())) {
|
| + } else if (String::Equals(type_name, factory()->symbol_string())) {
|
| __ JumpIfSmi(input, false_label, false_distance);
|
| __ CmpObjectType(input, SYMBOL_TYPE, input);
|
| final_branch_condition = equal;
|
|
|
| - } else if (type_name->Equals(heap()->boolean_string())) {
|
| + } else if (String::Equals(type_name, factory()->boolean_string())) {
|
| __ cmp(input, factory()->true_value());
|
| __ j(equal, true_label, true_distance);
|
| __ cmp(input, factory()->false_value());
|
| final_branch_condition = equal;
|
|
|
| - } else if (FLAG_harmony_typeof && type_name->Equals(heap()->null_string())) {
|
| + } else if (FLAG_harmony_typeof &&
|
| + String::Equals(type_name, factory()->null_string())) {
|
| __ cmp(input, factory()->null_value());
|
| final_branch_condition = equal;
|
|
|
| - } else if (type_name->Equals(heap()->undefined_string())) {
|
| + } else if (String::Equals(type_name, factory()->undefined_string())) {
|
| __ cmp(input, factory()->undefined_value());
|
| __ j(equal, true_label, true_distance);
|
| __ JumpIfSmi(input, false_label, false_distance);
|
| @@ -6133,7 +6134,7 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) {
|
| 1 << Map::kIsUndetectable);
|
| final_branch_condition = not_zero;
|
|
|
| - } 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);
|
| __ JumpIfSmi(input, false_label, false_distance);
|
| __ CmpObjectType(input, JS_FUNCTION_TYPE, input);
|
| @@ -6141,7 +6142,7 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) {
|
| __ CmpInstanceType(input, JS_FUNCTION_PROXY_TYPE);
|
| final_branch_condition = equal;
|
|
|
| - } else if (type_name->Equals(heap()->object_string())) {
|
| + } else if (String::Equals(type_name, factory()->object_string())) {
|
| __ JumpIfSmi(input, false_label, false_distance);
|
| if (!FLAG_harmony_typeof) {
|
| __ cmp(input, factory()->null_value());
|
|
|