| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index 426673afc55f79dd094c1be3a1911928a991845e..407154c3d21ec5adf6093a8bbfe0982d49796775 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -5501,11 +5501,6 @@ Condition LCodeGen::EmitTypeofIs(LTypeofIsAndBranch* instr, Register input) {
|
| __ CompareRoot(input, Heap::kFalseValueRootIndex);
|
| final_branch_condition = equal;
|
|
|
| - } else if (FLAG_harmony_typeof &&
|
| - String::Equals(type_name, factory->null_string())) {
|
| - __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| - final_branch_condition = equal;
|
| -
|
| } else if (String::Equals(type_name, factory->undefined_string())) {
|
| __ CompareRoot(input, Heap::kUndefinedValueRootIndex);
|
| __ j(equal, true_label, true_distance);
|
| @@ -5526,10 +5521,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) {
|
| - __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| - __ j(equal, true_label, true_distance);
|
| - }
|
| + __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| + __ 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);
|
|
|