| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 87ad6d9d50637bb043859e8ad9006485ab630e06..0631a22b93819ec73385f86b726377c4eed60390 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -5522,11 +5522,6 @@ Condition LCodeGen::EmitTypeofIs(Label* true_label,
|
| __ CompareRoot(input, Heap::kFalseValueRootIndex);
|
| final_branch_condition = eq;
|
|
|
| - } else if (FLAG_harmony_typeof &&
|
| - String::Equals(type_name, factory->null_string())) {
|
| - __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| - final_branch_condition = eq;
|
| -
|
| } else if (String::Equals(type_name, factory->undefined_string())) {
|
| __ CompareRoot(input, Heap::kUndefinedValueRootIndex);
|
| __ b(eq, true_label);
|
| @@ -5549,10 +5544,8 @@ Condition LCodeGen::EmitTypeofIs(Label* true_label,
|
| } else if (String::Equals(type_name, factory->object_string())) {
|
| Register map = scratch;
|
| __ JumpIfSmi(input, false_label);
|
| - if (!FLAG_harmony_typeof) {
|
| - __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| - __ b(eq, true_label);
|
| - }
|
| + __ CompareRoot(input, Heap::kNullValueRootIndex);
|
| + __ b(eq, true_label);
|
| __ CheckObjectTypeRange(input,
|
| map,
|
| FIRST_NONCALLABLE_SPEC_OBJECT_TYPE,
|
|
|