Index: src/crankshaft/ia32/lithium-codegen-ia32.cc |
diff --git a/src/crankshaft/ia32/lithium-codegen-ia32.cc b/src/crankshaft/ia32/lithium-codegen-ia32.cc |
index 7d0b657b9e6948c76278abbea91e6db6004a2e47..2d73c80c5c87f6223d122fb95216f74f6cd308a7 100644 |
--- a/src/crankshaft/ia32/lithium-codegen-ia32.cc |
+++ b/src/crankshaft/ia32/lithium-codegen-ia32.cc |
@@ -2441,26 +2441,11 @@ void LCodeGen::EmitClassOfTest(Label* is_true, |
DCHECK(!temp.is(temp2)); |
__ 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. |
- __ mov(temp, FieldOperand(input, HeapObject::kMapOffset)); |
- __ movzx_b(temp2, FieldOperand(temp, Map::kInstanceTypeOffset)); |
- __ sub(Operand(temp2), Immediate(FIRST_JS_RECEIVER_TYPE)); |
- __ cmp(Operand(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. |