Index: src/crankshaft/x64/lithium-codegen-x64.cc |
diff --git a/src/crankshaft/x64/lithium-codegen-x64.cc b/src/crankshaft/x64/lithium-codegen-x64.cc |
index 03c047d4e3da50805536f1f90e072f2704a4cea7..4a8c85846bb29126b91c43954032d1e55a92394a 100644 |
--- a/src/crankshaft/x64/lithium-codegen-x64.cc |
+++ b/src/crankshaft/x64/lithium-codegen-x64.cc |
@@ -2498,29 +2498,13 @@ void LCodeGen::EmitClassOfTest(Label* is_true, |
__ JumpIfSmi(input, is_false); |
+ __ CmpObjectType(input, JS_FUNCTION_TYPE, temp); |
if (String::Equals(isolate()->factory()->Function_string(), class_name)) { |
- // Assuming the following assertions, we can use the same compares to test |
- // for both being a function type and being in the object type range. |
- STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2); |
- STATIC_ASSERT(LAST_NONCALLABLE_SPEC_OBJECT_TYPE == |
- LAST_JS_RECEIVER_TYPE - 1); |
- STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE); |
- __ CmpObjectType(input, FIRST_JS_RECEIVER_TYPE, temp); |
- __ j(below, is_false); |
- __ CmpInstanceType(temp, LAST_JS_RECEIVER_TYPE); |
__ j(equal, is_true); |
} else { |
- // Faster code path to avoid two compares: subtract lower bound from the |
- // actual type and do a signed compare with the width of the type range. |
- __ movp(temp, FieldOperand(input, HeapObject::kMapOffset)); |
- __ movzxbl(temp2, FieldOperand(temp, Map::kInstanceTypeOffset)); |
- __ subp(temp2, Immediate(FIRST_JS_RECEIVER_TYPE)); |
- __ cmpp(temp2, Immediate(LAST_NONCALLABLE_SPEC_OBJECT_TYPE - |
- FIRST_JS_RECEIVER_TYPE)); |
- __ j(above, is_false); |
+ __ j(equal, is_false); |
} |
- // Now we are in the FIRST-LAST_NONCALLABLE_SPEC_OBJECT_TYPE range. |
// Check if the constructor in the map is a function. |
__ GetMapConstructor(temp, temp, kScratchRegister); |