LookupAndCallTernaryNode: accept either String name or SpecialMethodSlot

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/SetAttributeNode.java

@@ -42,6 +42,7 @@
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETATTR__;
 
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
@@ -57,7 +58,7 @@
 public abstract class SetAttributeNode extends StatementNode implements WriteNode {
 
     public static final class Dynamic extends PNodeWithContext {
-        @Child private LookupAndCallTernaryNode call = LookupAndCallTernaryNode.create(__SETATTR__);
+        @Child private LookupAndCallTernaryNode call = LookupAndCallTernaryNode.create(SpecialMethodSlot.SetAttr);
 
         public void execute(VirtualFrame frame, Object object, Object key, Object value) {
             call.execute(frame, object, key, value);

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

@@ -41,7 +41,9 @@
 package com.oracle.graal.python.nodes.call.special;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor.TernaryBuiltinDescriptor;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
@@ -62,6 +64,10 @@ public abstract class LookupAndCallNonReversibleTernaryNode extends LookupAndCal
         super(name);
     }
 
+    LookupAndCallNonReversibleTernaryNode(SpecialMethodSlot slot) {
+        super(slot);
+    }
+
     protected static PythonBuiltinClassType getBuiltinClass(Object receiver, GetClassNode getClassNode) {
         Object clazz = getClassNode.execute(receiver);
         return clazz instanceof PythonBuiltinClassType ? (PythonBuiltinClassType) clazz : null;
@@ -72,6 +78,14 @@ protected static boolean isClazz(PythonBuiltinClassType clazz, Object receiver,
     }
 
     protected final PythonTernaryBuiltinNode getTernaryBuiltin(PythonBuiltinClassType clazz) {
+        if (slot != null) {
+            Object attribute = slot.getValue(clazz);
+            if (attribute instanceof TernaryBuiltinDescriptor) {
+                return ((TernaryBuiltinDescriptor) attribute).createNode();
+            }
+            // If the slot does not contain builtin, full lookup wouldn't find a builtin either
+            return null;
+        }
         Object attribute = LookupAttributeInMRONode.Dynamic.getUncached().execute(clazz, name);
         if (attribute instanceof PBuiltinFunction) {
             PBuiltinFunction builtinFunction = (PBuiltinFunction) attribute;
@@ -94,7 +108,7 @@ static Object callObjectBuiltin(VirtualFrame frame, Object v, Object w, Object z
     Object callObject(VirtualFrame frame, Object arg1, Object arg2, Object arg3,
                     @SuppressWarnings("unused") @Cached("arg1.getClass()") Class<?> cachedArg1Class,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
+                    @Cached("createLookup()") LookupSpecialBaseNode getattr) {
         Object klass = getClassNode.execute(arg1);
         return dispatchNode.execute(frame, getattr.execute(frame, klass, arg1), arg1, arg2, arg3);
     }
@@ -103,7 +117,7 @@ Object callObject(VirtualFrame frame, Object arg1, Object arg2, Object arg3,
     @Megamorphic
     Object callObjectMegamorphic(VirtualFrame frame, Object arg1, Object arg2, Object arg3,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
+                    @Cached("createLookup()") LookupSpecialBaseNode getattr) {
         Object klass = getClassNode.execute(arg1);
         return dispatchNode.execute(frame, getattr.execute(frame, klass, arg1), arg1, arg2, arg3);
     }

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

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
@@ -72,11 +73,16 @@ public abstract class LookupAndCallReversibleTernaryNode extends LookupAndCallTe
         this.handlerFactory = handlerFactory;
     }
 
+    public LookupAndCallReversibleTernaryNode(SpecialMethodSlot slot, Supplier<NotImplementedHandler> handlerFactory) {
+        super(slot);
+        this.handlerFactory = handlerFactory;
+    }
+
     @Specialization(guards = "v.getClass() == cachedVClass", limit = "getCallSiteInlineCacheMaxDepth()")
     Object callObjectR(VirtualFrame frame, Object v, Object w, Object z,
                     @SuppressWarnings("unused") @Cached("v.getClass()") Class<?> cachedVClass,
-                    @Cached("create(name)") LookupSpecialMethodNode getattr,
-                    @Cached("create(name)") LookupSpecialMethodNode getattrR,
+                    @Cached("createLookup()") LookupSpecialMethodNode getattr,
+                    @Cached("createLookup()") LookupSpecialMethodNode getattrR,
                     @Cached GetClassNode getClass,
                     @Cached GetClassNode getClassR,
                     @Cached IsSubtypeNode isSubtype,
@@ -88,8 +94,8 @@ Object callObjectR(VirtualFrame frame, Object v, Object w, Object z,
     @Specialization(replaces = "callObjectR")
     @Megamorphic
     Object callObjectRMegamorphic(VirtualFrame frame, Object v, Object w, Object z,
-                    @Cached("create(name)") LookupSpecialMethodNode getattr,
-                    @Cached("create(name)") LookupSpecialMethodNode getattrR,
+                    @Cached("createLookup()") LookupSpecialMethodNode getattr,
+                    @Cached("createLookup()") LookupSpecialMethodNode getattrR,
                     @Cached GetClassNode getClass,
                     @Cached GetClassNode getClassR,
                     @Cached IsSubtypeNode isSubtype,

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

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.call.special;
 
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.runtime.PythonOptions;
@@ -56,6 +57,7 @@ public abstract static class NotImplementedHandler extends PNodeWithContext {
     }
 
     protected final String name;
+    protected final SpecialMethodSlot slot;
     @Child protected CallTernaryMethodNode dispatchNode = CallTernaryMethodNode.create();
 
     public abstract Object execute(VirtualFrame frame, Object arg1, Object arg2, Object arg3);
@@ -64,11 +66,32 @@ public static LookupAndCallTernaryNode create(String name) {
         return LookupAndCallNonReversibleTernaryNodeGen.create(name);
     }
 
+    public static LookupAndCallTernaryNode create(SpecialMethodSlot slot) {
+        return LookupAndCallNonReversibleTernaryNodeGen.create(slot);
+    }
+
     public static LookupAndCallTernaryNode createReversible(String name, Supplier<NotImplementedHandler> handlerFactory) {
         return LookupAndCallReversibleTernaryNodeGen.create(name, handlerFactory);
     }
 
+    public static LookupAndCallTernaryNode createReversible(SpecialMethodSlot slot, Supplier<NotImplementedHandler> handlerFactory) {
+        return LookupAndCallReversibleTernaryNodeGen.create(slot, handlerFactory);
+    }
+
     LookupAndCallTernaryNode(String name) {
         this.name = name;
+        this.slot = null;
+    }
+
+    LookupAndCallTernaryNode(SpecialMethodSlot slot) {
+        this.slot = slot;
+        this.name = slot.getName();
+    }
+
+    protected final LookupSpecialBaseNode createLookup() {
+        if (slot != null) {
+            return LookupSpecialMethodSlotNode.create(slot);
+        }
+        return LookupSpecialMethodNode.create(name);
     }
 }