Revert of [es5] Class of object is "Function" if object has [[Call]].

src/arm64/lithium-codegen-arm64.cc

Index: src/arm64/lithium-codegen-arm64.cc
diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc
index fc270c461848a79d5e5026551ea674093bbb701b..529352d77e621eee59eab594d09ac1c1ea55821f 100644
--- a/src/arm64/lithium-codegen-arm64.cc
+++ b/src/arm64/lithium-codegen-arm64.cc
@@ -2355,21 +2355,27 @@
   __ JumpIfSmi(input, false_label);
 
   Register map = scratch2;
-  STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
-  __ CompareObjectType(input, map, scratch1, FIRST_JS_RECEIVER_TYPE);
-  __ B(lt, false_label);
-
-  // Objects with [[Call]] have class 'Function'.
-  Register bit_field = scratch1;
-  __ Ldrb(bit_field, FieldMemOperand(map, Map::kBitFieldOffset));
-  __ Tst(bit_field, 1 << Map::kIsCallable);
   if (String::Equals(isolate()->factory()->Function_string(), class_name)) {
-    __ B(ne, true_label);
-  } else {
-    __ B(ne, false_label);
-  }
-
-  // Now we are in the FIRST-LAST_JS_RECEIVER_TYPE range.
+    // 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(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE ==
+                  FIRST_SPEC_OBJECT_TYPE + 1);
+    STATIC_ASSERT(LAST_NONCALLABLE_SPEC_OBJECT_TYPE ==
+                  LAST_SPEC_OBJECT_TYPE - 1);
+    STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
+
+    // We expect CompareObjectType to load the object instance type in scratch1.
+    __ CompareObjectType(input, map, scratch1, FIRST_SPEC_OBJECT_TYPE);
+    __ B(lt, false_label);
+    __ B(eq, true_label);
+    __ Cmp(scratch1, LAST_SPEC_OBJECT_TYPE);
+    __ B(eq, true_label);
+  } else {
+    __ IsObjectJSObjectType(input, map, scratch1, false_label);
+  }
+
+  // Now we are in the FIRST-LAST_NONCALLABLE_SPEC_OBJECT_TYPE range.
   // Check if the constructor in the map is a function.
   {
     UseScratchRegisterScope temps(masm());