[GR-30855] Use slots more (2).

PullRequest: graalpython/2078

Author: steve-s

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

@@ -41,7 +41,6 @@
 package com.oracle.graal.python.builtins.objects.type;
 
 import static com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot.Flags.NO_BUILTIN_DESCRIPTORS;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CLASS__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__AND__;
@@ -178,7 +177,6 @@ public enum SpecialMethodSlot {
     SetAttr(__SETATTR__),
     DelAttr(__DELATTR__),
 
-    Class(__CLASS__),
     Dict(__DICT__),
 
     Get(__GET__),
@@ -697,8 +695,6 @@ public static SpecialMethodSlot findSpecialSlot(String name) {
                 return SetAttr;
             case __DELATTR__:
                 return DelAttr;
-            case __CLASS__:
-                return Class;
             case __DICT__:
                 return Dict;
             case __GET__:

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

@@ -54,9 +54,10 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 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.LookupCallableSlotInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedSlotNode;
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
+import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -212,7 +213,8 @@ protected Object doGeneric(VirtualFrame frame, Object callableObject, Object[] a
                     @Shared("dispatchNode") @Cached CallDispatchNode dispatch,
                     @Shared("argsNode") @Cached CreateArgumentsNode createArgs,
                     @Shared("raise") @Cached PRaiseNode raise,
-                    @Cached LookupInheritedAttributeNode.Dynamic callAttrGetterNode,
+                    @Cached(parameters = "Call") LookupCallableSlotInMRONode callAttrGetterNode,
+                    @Cached GetClassNode getClassNode,
                     @Shared("callVarargs") @Cached CallVarargsMethodNode callCallNode) {
         if (callableObject instanceof PFunction) {
             return functionCall(frame, (PFunction) callableObject, arguments, keywords, dispatch, createArgs);
@@ -230,6 +232,6 @@ protected Object doGeneric(VirtualFrame frame, Object callableObject, Object[] a
             PBuiltinMethod method = (PBuiltinMethod) callableObject;
             return builtinMethodCallBuiltinDirect(frame, method, arguments, keywords, dispatch, createArgs);
         }
-        return callCall(frame, callableObject, arguments, keywords, raise, callCallNode, callAttrGetterNode.execute(callableObject, SpecialMethodNames.__CALL__));
+        return callCall(frame, callableObject, arguments, keywords, raise, callCallNode, callAttrGetterNode.execute(getClassNode.execute(callableObject)));
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java

@@ -87,6 +87,10 @@ public static LookupAndCallUnaryNode create(String name, Supplier<NoAttributeHan
         return LookupAndCallUnaryNodeGen.create(name, handlerFactory);
     }
 
+    public static LookupAndCallUnaryNode create(SpecialMethodSlot slot, Supplier<NoAttributeHandler> handlerFactory) {
+        return LookupAndCallUnaryNodeGen.create(slot, handlerFactory);
+    }
+
     LookupAndCallUnaryNode(SpecialMethodSlot slot, Supplier<NoAttributeHandler> handlerFactory) {
         this.slot = slot;
         this.name = slot.getName();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/GetNextNode.java

@@ -79,7 +79,7 @@ public Object execute(Object iterator) {
     @NodeInfo(cost = NONE)
     private static final class GetNextCached extends GetNextNode {
 
-        @Child private LookupAndCallUnaryNode nextCall = LookupAndCallUnaryNode.create(__NEXT__, () -> new NoAttributeHandler() {
+        @Child private LookupAndCallUnaryNode nextCall = LookupAndCallUnaryNode.create(SpecialMethodSlot.Next, () -> new NoAttributeHandler() {
             @Child private PRaiseNode raiseNode = PRaiseNode.create();
 
             @Override