Use __call__ slot in CallNode

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java

@@ -164,7 +164,7 @@ public enum SpecialMethodSlot {
     SetName(__SET_NAME__, NO_BUILTIN_DESCRIPTORS),
     InstanceCheck(__INSTANCECHECK__),
     Subclasscheck(__SUBCLASSCHECK__),
-    Call(__CALL__),
+    Call(__CALL__, NO_BUILTIN_DESCRIPTORS),
 
     GetItem(__GETITEM__),
     SetItem(__SETITEM__),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallNode.java

@@ -55,6 +55,7 @@
 import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
 import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
+import com.oracle.graal.python.nodes.attributes.LookupInheritedSlotNode;
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.truffle.api.dsl.Cached;
@@ -124,7 +125,7 @@ protected Object builtinFunctionCall(VirtualFrame frame, PBuiltinFunction callab
     @Specialization
     protected Object doType(VirtualFrame frame, PythonBuiltinClassType callableObject, Object[] arguments, PKeyword[] keywords,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Shared("lookupCall") @Cached("create(__CALL__)") LookupInheritedAttributeNode callAttrGetterNode,
+                    @Shared("lookupCall") @Cached("create(Call)") LookupInheritedSlotNode callAttrGetterNode,
                     @Shared("callCall") @Cached CallVarargsMethodNode callCallNode) {
         Object call = callAttrGetterNode.execute(callableObject);
         return callCall(frame, callableObject, arguments, keywords, raise, callCallNode, call);
@@ -133,7 +134,7 @@ protected Object doType(VirtualFrame frame, PythonBuiltinClassType callableObjec
     @Specialization(guards = "isPythonClass(callableObject)", replaces = "doType")
     protected Object doPythonClass(VirtualFrame frame, Object callableObject, Object[] arguments, PKeyword[] keywords,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Shared("lookupCall") @Cached("create(__CALL__)") LookupInheritedAttributeNode callAttrGetterNode,
+                    @Shared("lookupCall") @Cached("create(Call)") LookupInheritedSlotNode callAttrGetterNode,
                     @Shared("callCall") @Cached CallVarargsMethodNode callCallNode) {
         Object call = callAttrGetterNode.execute(callableObject);
         return callCall(frame, callableObject, arguments, keywords, raise, callCallNode, call);
@@ -142,7 +143,7 @@ protected Object doPythonClass(VirtualFrame frame, Object callableObject, Object
     @Specialization(guards = "!isCallable(callableObject)", replaces = {"doType", "doPythonClass"})
     protected Object doObjectAndType(VirtualFrame frame, Object callableObject, Object[] arguments, PKeyword[] keywords,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Shared("lookupCall") @Cached("create(__CALL__)") LookupInheritedAttributeNode callAttrGetterNode,
+                    @Shared("lookupCall") @Cached("create(Call)") LookupInheritedSlotNode callAttrGetterNode,
                     @Shared("callCall") @Cached CallVarargsMethodNode callCallNode) {
         Object call = callAttrGetterNode.execute(callableObject);
         return callCall(frame, callableObject, arguments, keywords, raise, callCallNode, call);
@@ -191,15 +192,15 @@ protected Object builtinMethodCallBuiltinDirect(VirtualFrame frame, PBuiltinMeth
     @Specialization(guards = "!isFunction(callable.getFunction())")
     protected Object methodCall(VirtualFrame frame, PMethod callable, Object[] arguments, PKeyword[] keywords,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Shared("lookupCall") @Cached("create(__CALL__)") LookupInheritedAttributeNode callAttrGetterNode,
+                    @Shared("lookupCall") @Cached("create(Call)") LookupInheritedSlotNode callAttrGetterNode,
                     @Shared("callCall") @Cached CallVarargsMethodNode callCallNode) {
         return doObjectAndType(frame, callable, arguments, keywords, raise, callAttrGetterNode, callCallNode);
     }
 
     @Specialization(guards = "!isFunction(callable.getFunction())")
     protected Object builtinMethodCall(VirtualFrame frame, PBuiltinMethod callable, Object[] arguments, PKeyword[] keywords,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Shared("lookupCall") @Cached("create(__CALL__)") LookupInheritedAttributeNode callAttrGetterNode,
+                    @Shared("lookupCall") @Cached("create(Call)") LookupInheritedSlotNode callAttrGetterNode,
                     @Shared("callVarargs") @Cached CallVarargsMethodNode callCallNode) {
         return doObjectAndType(frame, callable, arguments, keywords, raise, callAttrGetterNode, callCallNode);
     }