Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 0cd5c36135f436a0c5356befd865f334daa6b0bb..ca3a6400b284be0612a504847f08efa315672534 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -5320,11 +5320,6 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) { |
__ cmp(input, factory()->false_value()); |
final_branch_condition = equal; |
- } else if (FLAG_harmony_typeof && |
- String::Equals(type_name, factory()->null_string())) { |
- __ cmp(input, factory()->null_value()); |
- final_branch_condition = equal; |
- |
} else if (String::Equals(type_name, factory()->undefined_string())) { |
__ cmp(input, factory()->undefined_value()); |
__ j(equal, true_label, true_distance); |
@@ -5345,10 +5340,8 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) { |
} else if (String::Equals(type_name, factory()->object_string())) { |
__ JumpIfSmi(input, false_label, false_distance); |
- if (!FLAG_harmony_typeof) { |
- __ cmp(input, factory()->null_value()); |
- __ j(equal, true_label, true_distance); |
- } |
+ __ cmp(input, factory()->null_value()); |
+ __ j(equal, true_label, true_distance); |
__ CmpObjectType(input, FIRST_NONCALLABLE_SPEC_OBJECT_TYPE, input); |
__ j(below, false_label, false_distance); |
__ CmpInstanceType(input, LAST_NONCALLABLE_SPEC_OBJECT_TYPE); |