Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index 51842360d3e2b7804d5102936f6248ff32dcebb6..beea0b6588da58f1f8b717d298bf8009d630ad79 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -4436,10 +4436,6 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ j(equal, if_true); |
__ cmp(eax, isolate()->factory()->false_value()); |
Split(equal, if_true, if_false, fall_through); |
- } else if (FLAG_harmony_typeof && |
- String::Equals(check, factory->null_string())) { |
- __ cmp(eax, isolate()->factory()->null_value()); |
- Split(equal, if_true, if_false, fall_through); |
} else if (String::Equals(check, factory->undefined_string())) { |
__ cmp(eax, isolate()->factory()->undefined_value()); |
__ j(equal, if_true); |
@@ -4458,10 +4454,8 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
Split(equal, if_true, if_false, fall_through); |
} else if (String::Equals(check, factory->object_string())) { |
__ JumpIfSmi(eax, if_false); |
- if (!FLAG_harmony_typeof) { |
- __ cmp(eax, isolate()->factory()->null_value()); |
- __ j(equal, if_true); |
- } |
+ __ cmp(eax, isolate()->factory()->null_value()); |
+ __ j(equal, if_true); |
__ CmpObjectType(eax, FIRST_NONCALLABLE_SPEC_OBJECT_TYPE, edx); |
__ j(below, if_false); |
__ CmpInstanceType(edx, LAST_NONCALLABLE_SPEC_OBJECT_TYPE); |