Changeset 260722 in webkit

Timestamp:

Apr 25, 2020, 10:07:21 PM (6 years ago)

Author:

Ross Kirsling

Message:

[JSC] isCallable is redundant with isFunction
​https://bugs.webkit.org/show_bug.cgi?id=211037

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

isCallable is only being used in two places and has the same definition as isFunction (aside from out params).
Where CallData is needed, getCallData should be used; where CallData is not needed, isFunction should be used.

• runtime/JSCJSValue.h:
• runtime/JSCJSValueInlines.h:

(JSC::JSValue::isCallable const): Deleted.

• runtime/JSCell.h:
• runtime/JSCellInlines.h:

(JSC::JSCell::isCallable): Deleted.
Remove isCallable.

• runtime/JSONObject.cpp:

(JSC::Stringifier::Stringifier):
(JSC::Stringifier::toJSON):
Use getCallData if you need CallData.

• runtime/ExceptionHelpers.cpp:

(JSC::errorDescriptionForValue):

• runtime/ObjectConstructor.cpp:

(JSC::toPropertyDescriptor):

• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncDefineGetter):
(JSC::objectProtoFuncDefineSetter):
Don't use getCallData if you don't need CallData.

Source/WebCore:

• bindings/js/JSDOMConvertScheduledAction.h:

(WebCore::Converter<IDLScheduledAction>::convert):

• worklets/PaintWorkletGlobalScope.cpp:

(WebCore::PaintWorkletGlobalScope::registerPaint):
Don't use getCallData if you don't need CallData.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/ExceptionHelpers.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSCJSValue.h (modified) (1 diff)
• JavaScriptCore/runtime/JSCJSValueInlines.h (modified) (1 diff)
• JavaScriptCore/runtime/JSCell.h (modified) (1 diff)
• JavaScriptCore/runtime/JSCellInlines.h (modified) (1 diff)
• JavaScriptCore/runtime/JSONObject.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/ObjectConstructor.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/ObjectPrototype.cpp (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMConvertScheduledAction.h (modified) (1 diff)
• WebCore/worklets/PaintWorkletGlobalScope.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-25  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [JSC] isCallable is redundant with isFunction
+        https://bugs.webkit.org/show_bug.cgi?id=211037
+
+        Reviewed by Yusuke Suzuki.
+
+        isCallable is only being used in two places and has the same definition as isFunction (aside from out params).
+        Where CallData is needed, getCallData should be used; where CallData is not needed, isFunction should be used.
+
+        * runtime/JSCJSValue.h:
+        * runtime/JSCJSValueInlines.h:
+        (JSC::JSValue::isCallable const): Deleted.
+        * runtime/JSCell.h:
+        * runtime/JSCellInlines.h:
+        (JSC::JSCell::isCallable): Deleted.
+        Remove isCallable.
+
+        * runtime/JSONObject.cpp:
+        (JSC::Stringifier::Stringifier):
+        (JSC::Stringifier::toJSON):
+        Use getCallData if you need CallData.
+
+        * runtime/ExceptionHelpers.cpp:
+        (JSC::errorDescriptionForValue):
+        * runtime/ObjectConstructor.cpp:
+        (JSC::toPropertyDescriptor):
+        * runtime/ObjectPrototype.cpp:
+        (JSC::objectProtoFuncDefineGetter):
+        (JSC::objectProtoFuncDefineSetter):
+        Don't use getCallData if you don't need CallData. 
+
 2020-04-25  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -95 +95 @@
     if (v.isObject()) {
         VM& vm = globalObject->vm();
-        CallData callData;
         JSObject* object = asObject(v);
-        if (object->methodTable(vm)->getCallData(object, callData) != CallType::None)
+        if (object->isFunction(vm))
             return vm.smallStrings.functionString()->value(globalObject);
         return JSObject::calculatedClassName(object);

trunk/Source/JavaScriptCore/runtime/JSCJSValue.h

@@ -235 +235 @@
     bool isEmpty() const;
     bool isFunction(VM&) const;
-    bool isCallable(VM&) const;
-    bool isCallable(VM&, CallType&, CallData&) const;
     bool isConstructor(VM&) const;
     bool isConstructor(VM&, ConstructType&, ConstructData&) const;

trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h

@@ -881 +881 @@
         return false;
     return asCell()->isFunction(vm);
-}
-
-inline bool JSValue::isCallable(VM& vm) const
-{
-    CallType unusedType;
-    CallData unusedData;
-    return isCallable(vm, unusedType, unusedData);
-}
-
-inline bool JSValue::isCallable(VM& vm, CallType& callType, CallData& callData) const
-{
-    if (!isCell())
-        return false;
-    return asCell()->isCallable(vm, callType, callData);
 }
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -109 +109 @@
     bool isProxy() const;
     bool isFunction(VM&);
-    bool isCallable(VM&, CallType&, CallData&);
     bool isConstructor(VM&);
     bool isConstructor(VM&, ConstructType&, ConstructData&);

trunk/Source/JavaScriptCore/runtime/JSCellInlines.h

@@ -241 +241 @@
 }
 
-inline bool JSCell::isCallable(VM& vm, CallType& callType, CallData& callData)
-{
-    if (type() != JSFunctionType && !(inlineTypeFlags() & OverridesGetCallData))
-        return false;
-    callType = methodTable(vm)->getCallData(this, callData);
-    return callType != CallType::None;
-}
-
 inline bool JSCell::isConstructor(VM& vm)
 {

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -232 +232 @@
         JSObject* replacerObject = asObject(m_replacer);
 
-        m_replacerCallType = CallType::None;
-        if (!replacerObject->isCallable(vm, m_replacerCallType, m_replacerCallData)) {
+        m_replacerCallType = getCallData(vm, replacerObject, m_replacerCallData);
+        if (m_replacerCallType == CallType::None) {
             bool isArrayReplacer = JSC::isArray(globalObject, replacerObject);
             RETURN_IF_EXCEPTION(scope, );
@@ -305 +305 @@
     RETURN_IF_EXCEPTION(scope, { });
 
-    CallType callType;
     CallData callData;
-    if (!toJSONFunction.isCallable(vm, callType, callData))
+    CallType callType = getCallData(vm, toJSONFunction, callData);
+    if (callType == CallType::None)
         return baseValue;
 

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -532 +532 @@
         JSValue get = description->get(globalObject, vm.propertyNames->get);
         RETURN_IF_EXCEPTION(scope, false);
-        if (!get.isUndefined()) {
-            CallData callData;
-            if (getCallData(vm, get, callData) == CallType::None) {
-                throwTypeError(globalObject, scope, "Getter must be a function."_s);
-                return false;
-            }
+        if (!get.isUndefined() && !get.isFunction(vm)) {
+            throwTypeError(globalObject, scope, "Getter must be a function."_s);
+            return false;
         }
         desc.setGetter(get);
@@ -548 +545 @@
         JSValue set = description->get(globalObject, vm.propertyNames->set);
         RETURN_IF_EXCEPTION(scope, false);
-        if (!set.isUndefined()) {
-            CallData callData;
-            if (getCallData(vm, set, callData) == CallType::None) {
-                throwTypeError(globalObject, scope, "Setter must be a function."_s);
-                return false;
-            }
+        if (!set.isUndefined() && !set.isFunction(vm)) {
+            throwTypeError(globalObject, scope, "Setter must be a function."_s);
+            return false;
         }
         desc.setSetter(set);

trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp

@@ -155 +155 @@
 
     JSValue get = callFrame->argument(1);
-    CallData callData;
-    if (getCallData(vm, get, callData) == CallType::None)
+    if (!get.isFunction(vm))
         return throwVMTypeError(globalObject, scope, "invalid getter usage"_s);
 
@@ -183 +182 @@
 
     JSValue set = callFrame->argument(1);
-    CallData callData;
-    if (getCallData(vm, set, callData) == CallType::None)
+    if (!set.isFunction(vm))
         return throwVMTypeError(globalObject, scope, "invalid setter usage"_s);
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-25  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [JSC] isCallable is redundant with isFunction
+        https://bugs.webkit.org/show_bug.cgi?id=211037
+
+        Reviewed by Yusuke Suzuki.
+
+        * bindings/js/JSDOMConvertScheduledAction.h:
+        (WebCore::Converter<IDLScheduledAction>::convert):
+        * worklets/PaintWorkletGlobalScope.cpp:
+        (WebCore::PaintWorkletGlobalScope::registerPaint):
+        Don't use getCallData if you don't need CallData. 
+
 2020-04-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/bindings/js/JSDOMConvertScheduledAction.h

@@ -39 +39 @@
         auto scope = DECLARE_THROW_SCOPE(vm);
 
-        JSC::CallData callData;
-        if (getCallData(vm, value, callData) == JSC::CallType::None) {
+        if (!value.isFunction(vm)) {
             auto code = Converter<IDLDOMString>::convert(lexicalGlobalObject, value);
             RETURN_IF_EXCEPTION(scope, nullptr);

trunk/Source/WebCore/worklets/PaintWorkletGlobalScope.cpp

@@ -76 +76 @@
 
     // Validate that paintConstructor is a VoidFunction
-    CallData callData;
-    if (JSC::getCallData(vm, paintConstructor.get(), callData) == JSC::CallType::None)
+    if (!paintConstructor->isFunction(vm))
         return Exception { TypeError, "paintConstructor must be callable" };