[runtime] Remove obsolete Object::IsSpecFunction.

bmeurer · Commit bot · commit 91c495ff4463 · 2015-09-23T05:53:40.000Z
We don't need Object::IsSpecFunction anymore, since it only checks for JSFunction and JSFunctionProxy, but what you actually want to check for (in case of accessors) is whether the target has a [[Call]] internal method, which is exactly what Object::IsCallable does. CQ_INCLUDE_TRYBOTS=tryserver.v8:v8_linux_layout_dbg,v8_linux_nosnap_dbg R=rossberg@chromium.org BUG=v8:4413 LOG=n Review URL: https://codereview.chromium.org/1358403002 Cr-Commit-Position: refs/heads/master@{#30875}
diff --git a/src/objects-inl.h b/src/objects-inl.h
@@ -198,14 +198,6 @@ bool Object::IsSpecObject() const {
 }
 
 
-// TODO(rossberg): Remove this and use the spec compliant IsCallable instead.
-bool Object::IsSpecFunction() const {
-  if (!Object::IsHeapObject()) return false;
-  InstanceType type = HeapObject::cast(this)->map()->instance_type();
-  return type == JS_FUNCTION_TYPE || type == JS_FUNCTION_PROXY_TYPE;
-}
-
-
 bool Object::IsTemplateInfo() const {
   return IsObjectTemplateInfo() || IsFunctionTemplateInfo();
 }
@@ -7359,7 +7351,7 @@ bool AccessorPair::ContainsAccessor() {
 
 
 bool AccessorPair::IsJSAccessor(Object* obj) {
-  return obj->IsSpecFunction() || obj->IsUndefined();
+  return obj->IsCallable() || obj->IsUndefined();
 }
 
 
diff --git a/src/objects.cc b/src/objects.cc
@@ -798,7 +798,7 @@ MaybeHandle<Object> Object::GetPropertyWithAccessor(
 
   // Regular accessor.
   Handle<Object> getter(AccessorPair::cast(*structure)->getter(), isolate);
-  if (getter->IsSpecFunction()) {
+  if (getter->IsCallable()) {
     // TODO(rossberg): nicer would be to cast to some JSCallable here...
     return Object::GetPropertyWithDefinedGetter(
         receiver, Handle<JSReceiver>::cast(getter));
@@ -854,7 +854,7 @@ MaybeHandle<Object> Object::SetPropertyWithAccessor(
 
   // Regular accessor.
   Handle<Object> setter(AccessorPair::cast(*structure)->setter(), isolate);
-  if (setter->IsSpecFunction()) {
+  if (setter->IsCallable()) {
     // TODO(rossberg): nicer would be to cast to some JSCallable here...
     return SetPropertyWithDefinedSetter(
         receiver, Handle<JSReceiver>::cast(setter), value);
@@ -6918,8 +6918,8 @@ MaybeHandle<Object> JSObject::DefineAccessor(Handle<JSObject> object,
     }
   }
 
-  DCHECK(getter->IsSpecFunction() || getter->IsUndefined() || getter->IsNull());
-  DCHECK(setter->IsSpecFunction() || setter->IsUndefined() || setter->IsNull());
+  DCHECK(getter->IsCallable() || getter->IsUndefined() || getter->IsNull());
+  DCHECK(setter->IsCallable() || setter->IsUndefined() || setter->IsNull());
   // At least one of the accessors needs to be a new value.
   DCHECK(!getter->IsNull() || !setter->IsNull());
   if (!getter->IsNull()) {
diff --git a/src/objects.h b/src/objects.h
@@ -1034,8 +1034,6 @@ class Object {
   INLINE(bool IsCallable() const);
 
   INLINE(bool IsSpecObject()) const;
-  // TODO(rossberg): IsSpecFunction should be removed in favor of IsCallable.
-  INLINE(bool IsSpecFunction()) const;
   INLINE(bool IsTemplateInfo()) const;
   INLINE(bool IsNameDictionary() const);
   INLINE(bool IsGlobalDictionary() const);
diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc
@@ -1204,7 +1204,7 @@ RUNTIME_FUNCTION(Runtime_IsJSGlobalProxy) {
 
 
 static bool IsValidAccessor(Handle<Object> obj) {
-  return obj->IsUndefined() || obj->IsSpecFunction() || obj->IsNull();
+  return obj->IsUndefined() || obj->IsCallable() || obj->IsNull();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -198,14 +198,6 @@ bool Object::IsSpecObject() const {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`
`201`		`-// TODO(rossberg): Remove this and use the spec compliant IsCallable instead.`
`202`		`-bool Object::IsSpecFunction() const {`
`203`		`- if (!Object::IsHeapObject()) return false;`
`204`		`- InstanceType type = HeapObject::cast(this)->map()->instance_type();`
`205`		`- return type == JS_FUNCTION_TYPE \|\| type == JS_FUNCTION_PROXY_TYPE;`
`206`		`-}`
`207`		`-`
`208`		`-`
`209`	`201`	`bool Object::IsTemplateInfo() const {`
`210`	`202`	`return IsObjectTemplateInfo() \|\| IsFunctionTemplateInfo();`
`211`	`203`	`}`
`@@ -7359,7 +7351,7 @@ bool AccessorPair::ContainsAccessor() {`
`7359`	`7351`
`7360`	`7352`
`7361`	`7353`	`bool AccessorPair::IsJSAccessor(Object* obj) {`
`7362`		`- return obj->IsSpecFunction() \|\| obj->IsUndefined();`
	`7354`	`+ return obj->IsCallable() \|\| obj->IsUndefined();`
`7363`	`7355`	`}`
`7364`	`7356`
`7365`	`7357`
Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ RUNTIME_FUNCTION(Runtime_IsJSGlobalProxy) {`
`1204`	`1204`
`1205`	`1205`
`1206`	`1206`	`static bool IsValidAccessor(Handle<Object> obj) {`
`1207`		`- return obj->IsUndefined() \|\| obj->IsSpecFunction() \|\| obj->IsNull();`
	`1207`	`+ return obj->IsUndefined() \|\| obj->IsCallable() \|\| obj->IsNull();`
`1208`	`1208`	`}`
`1209`	`1209`
`1210`	`1210`