Refactor LookupSpecial nodes

msimacek · msimacek · commit 85c0dc0be603 · 2021-05-25T16:48:09.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java
@@ -47,7 +47,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialBaseNode.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java
@@ -44,7 +44,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialBaseNode.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java
@@ -46,7 +46,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialBaseNode.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.runtime.PythonContext;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallUnaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallUnaryMethodNode.java
@@ -47,7 +47,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialBaseNode.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.PythonContext;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallVarargsMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallVarargsMethodNode.java
@@ -45,7 +45,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialBaseNode.BoundDescriptor;
+import com.oracle.graal.python.nodes.call.special.MaybeBindDescriptor.BoundDescriptor;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode.VarargsBuiltinDirectInvocationNotSupported;
 import com.oracle.graal.python.util.PythonUtils;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java
@@ -403,19 +403,19 @@ Object callObjectGeneric(VirtualFrame frame, Object left, Object right,
                     @SuppressWarnings("unused") @Cached("left.getClass()") Class<?> cachedLeftClass,
                     @SuppressWarnings("unused") @Cached("right.getClass()") Class<?> cachedRightClass,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr) {
+                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
         return doCallObject(frame, left, right, getClassNode, getattr);
     }
 
     @Specialization(guards = "!isReversible()", replaces = "callObjectGeneric")
     @Megamorphic
     Object callObjectMegamorphic(VirtualFrame frame, Object left, Object right,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr) {
+                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
         return doCallObject(frame, left, right, getClassNode, getattr);
     }
 
-    private Object doCallObject(VirtualFrame frame, Object left, Object right, GetClassNode getClassNode, LookupSpecialMethodSlotNode getattr) {
+    private Object doCallObject(VirtualFrame frame, Object left, Object right, GetClassNode getClassNode, LookupSpecialBaseNode getattr) {
         Object leftClass = getClassNode.execute(left);
         Object leftCallable;
         try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java
@@ -102,7 +102,7 @@ protected boolean isReversible() {
     Object callObject(VirtualFrame frame, Object arg1, int arg2, Object arg3,
                     @SuppressWarnings("unused") @Cached("arg1.getClass()") Class<?> cachedArg1Class,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr) {
+                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
         Object klass = getClassNode.execute(arg1);
         return dispatchNode.execute(frame, getattr.execute(frame, klass, arg1), arg1, arg2, arg3);
     }
@@ -111,7 +111,7 @@ Object callObject(VirtualFrame frame, Object arg1, int arg2, Object arg3,
     Object callObject(VirtualFrame frame, Object arg1, Object arg2, Object arg3,
                     @SuppressWarnings("unused") @Cached("arg1.getClass()") Class<?> cachedArg1Class,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr) {
+                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
         Object klass = getClassNode.execute(arg1);
         return dispatchNode.execute(frame, getattr.execute(frame, klass, arg1), arg1, arg2, arg3);
     }
@@ -120,7 +120,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)") LookupSpecialMethodSlotNode getattr) {
+                    @Cached("create(name)") LookupSpecialBaseNode getattr) {
         Object klass = getClassNode.execute(arg1);
         return dispatchNode.execute(frame, getattr.execute(frame, klass, arg1), arg1, arg2, arg3);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallUnaryNode.java
@@ -217,7 +217,7 @@ static Object callObject(VirtualFrame frame, PNone receiver,
     Object callObjectGeneric(VirtualFrame frame, Object receiver,
                     @SuppressWarnings("unused") @Cached("receiver.getClass()") Class<?> cachedClass,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr,
+                    @Cached("create(name)") LookupSpecialBaseNode getattr,
                     @Cached CallUnaryMethodNode dispatchNode) {
         return doCallObject(frame, receiver, getClassNode, getattr, dispatchNode);
     }
@@ -226,7 +226,7 @@ Object callObjectGeneric(VirtualFrame frame, Object receiver,
     @Megamorphic
     Object callObjectMegamorphic(VirtualFrame frame, Object receiver,
                     @Cached GetClassNode getClassNode,
-                    @Cached("create(name)") LookupSpecialMethodSlotNode getattr,
+                    @Cached("create(name)") LookupSpecialBaseNode getattr,
                     @Cached CallUnaryMethodNode dispatchNode) {
         return doCallObject(frame, receiver, getClassNode, getattr, dispatchNode);
     }
@@ -235,7 +235,7 @@ protected Class<?> getObjectClass(Object object) {
         return object.getClass();
     }
 
-    private Object doCallObject(VirtualFrame frame, Object receiver, GetClassNode getClassNode, LookupSpecialMethodSlotNode getattr, CallUnaryMethodNode dispatchNode) {
+    private Object doCallObject(VirtualFrame frame, Object receiver, GetClassNode getClassNode, LookupSpecialBaseNode getattr, CallUnaryMethodNode dispatchNode) {
         Object attr = getattr.execute(frame, getClassNode.execute(receiver), receiver);
         if (attr == PNone.NO_VALUE) {
             if (handlerFactory != null) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialBaseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialBaseNode.java
@@ -40,61 +40,19 @@
  */
 package com.oracle.graal.python.nodes.call.special;
 
-import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
-import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
-import com.oracle.graal.python.builtins.objects.function.PFunction;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.attributes.LookupInMROBaseNode;
-import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.ValueProfile;
 
 public abstract class LookupSpecialBaseNode extends Node {
-    @Child LookupInMROBaseNode lookupNode; // this should be initialized by the subclass
-    @Child private LookupInheritedAttributeNode lookupGet;
-    @Child private CallNode callGet;
-    private final ValueProfile lookupResProfile = ValueProfile.createClassProfile();
+    public abstract Object execute(VirtualFrame frame, Object type, Object receiver);
 
-    public final Object execute(VirtualFrame frame, Object type, Object receiver) {
-        Object descriptor = lookupResProfile.profile(lookupNode.execute(type));
-        if (descriptor == PNone.NO_VALUE || descriptor instanceof PBuiltinFunction || descriptor instanceof PFunction || descriptor instanceof BuiltinMethodDescriptor) {
-            // Return unbound to avoid constructing the bound object
-            return descriptor;
+    public static LookupSpecialBaseNode create(String key) {
+        SpecialMethodSlot slot = SpecialMethodSlot.findSpecialSlot(key);
+        if (slot != null) {
+            return LookupSpecialMethodSlotNode.create(slot);
         }
-        // Acts as a profile
-        Object getMethod = ensureLookupGet().execute(descriptor);
-        if (getMethod != PNone.NO_VALUE) {
-            return new BoundDescriptor(ensureCallGet().execute(frame, getMethod, descriptor, receiver, type));
-        }
-        // CPython considers non-descriptors already bound
-        return new BoundDescriptor(descriptor);
-    }
-
-    private LookupInheritedAttributeNode ensureLookupGet() {
-        if (lookupGet == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            lookupGet = insert(LookupInheritedAttributeNode.create(SpecialMethodNames.__GET__));
-        }
-        return lookupGet;
-    }
-
-    private CallNode ensureCallGet() {
-        if (callGet == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            callGet = insert(CallNode.create());
-        }
-        return callGet;
+        return LookupSpecialMethodNode.create(key);
     }
 
-    public static class BoundDescriptor {
-        public final Object descriptor;
-
-        public BoundDescriptor(Object descriptor) {
-            this.descriptor = descriptor;
-        }
-    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodNode.java
@@ -47,7 +47,6 @@
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNodeFactory.DynamicNodeGen;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -62,13 +61,22 @@
  * differentiate it from the unbound case. {@link CallUnaryMethodNode} and other method calling
  * nodes handle this wrapper.
  */
-public final class LookupSpecialMethodNode extends LookupSpecialBaseNode {
-    LookupSpecialMethodNode(String name) {
-        this.lookupNode = LookupAttributeInMRONode.create(name);
+public abstract class LookupSpecialMethodNode extends LookupSpecialBaseNode {
+    protected final String name;
+
+    public LookupSpecialMethodNode(String name) {
+        this.name = name;
     }
 
     public static LookupSpecialMethodNode create(String name) {
-        return new LookupSpecialMethodNode(name);
+        return LookupSpecialMethodNodeGen.create(name);
+    }
+
+    @Specialization
+    Object lookup(VirtualFrame frame, Object type, Object receiver,
+                    @Cached(parameters = "name") LookupAttributeInMRONode lookupMethod,
+                    @Cached MaybeBindDescriptor bind) {
+        return bind.execute(frame, lookupMethod.execute(type), receiver);
     }
 
     @GenerateUncached
@@ -77,11 +85,11 @@ public abstract static class Dynamic extends Node {
         public abstract Object execute(Frame frame, Object type, String name, Object receiver);
 
         public static Dynamic create() {
-            return DynamicNodeGen.create();
+            return LookupSpecialMethodNodeGen.DynamicNodeGen.create();
         }
 
         public static Dynamic getUncached() {
-            return DynamicNodeGen.getUncached();
+            return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached();
         }
 
         @Specialization
@@ -96,10 +104,10 @@ Object lookup(VirtualFrame frame, Object type, String name, Object receiver,
             }
             Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
             if (getMethod != PNone.NO_VALUE) {
-                return new BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
+                return new MaybeBindDescriptor.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
             }
             // CPython considers non-descriptors already bound
-            return new BoundDescriptor(descriptor);
+            return new MaybeBindDescriptor.BoundDescriptor(descriptor);
         }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodSlotNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupSpecialMethodSlotNode.java
@@ -41,20 +41,33 @@
 package com.oracle.graal.python.nodes.call.special;
 
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
-import com.oracle.graal.python.nodes.attributes.LookupInMROBaseNode;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
+import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
  * The same as {@link LookupSpecialMethodNode}, but this searches the special slots first. On top of
  * the possible types of return values of {@link LookupSpecialMethodNode}, this node may also return
  * {@link BuiltinMethodDescriptor}, which all the {@link CallBinaryMethodNode} and similar should
  * handle as well.
  */
-public final class LookupSpecialMethodSlotNode extends LookupSpecialBaseNode {
-    LookupSpecialMethodSlotNode(String name) {
-        this.lookupNode = LookupInMROBaseNode.create(name);
+public abstract class LookupSpecialMethodSlotNode extends LookupSpecialBaseNode {
+    protected final SpecialMethodSlot slot;
+
+    public LookupSpecialMethodSlotNode(SpecialMethodSlot slot) {
+        this.slot = slot;
+    }
+
+    public static LookupSpecialMethodSlotNode create(SpecialMethodSlot slot) {
+        return LookupSpecialMethodSlotNodeGen.create(slot);
     }
 
-    public static LookupSpecialMethodSlotNode create(String name) {
-        return new LookupSpecialMethodSlotNode(name);
+    @Specialization
+    Object lookup(VirtualFrame frame, Object type, Object receiver,
+                    @Cached(parameters = "slot") LookupCallableSlotInMRONode lookupSlot,
+                    @Cached MaybeBindDescriptor bind) {
+        return bind.execute(frame, lookupSlot.execute(type), receiver);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/MaybeBindDescriptor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/MaybeBindDescriptor.java
@@ -0,0 +1,74 @@
+package com.oracle.graal.python.nodes.call.special;
+
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
+import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
+import com.oracle.graal.python.builtins.objects.function.PFunction;
+import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+/**
+ * Bind the descriptor to the receiver unless it's one of the descriptor types that our method call
+ * nodes handle unbound.
+ */
+@GenerateUncached
+public abstract class MaybeBindDescriptor extends PNodeWithContext {
+
+    /**
+     * Wrapper for bound descriptor cases, just to be able to distinguish them from unbound
+     * callables.
+     */
+    public static class BoundDescriptor {
+        public final Object descriptor;
+
+        public BoundDescriptor(Object descriptor) {
+            this.descriptor = descriptor;
+        }
+    }
+
+    public abstract Object execute(Frame frame, Object descriptor, Object receiver);
+
+    @Specialization(guards = "isNoValue(descriptor)")
+    static Object doNoValue(Object descriptor, @SuppressWarnings("unused") Object receiver) {
+        return descriptor;
+    }
+
+    @Specialization
+    static Object doBuiltin(BuiltinMethodDescriptor descriptor, @SuppressWarnings("unused") Object receiver) {
+        return descriptor;
+    }
+
+    @Specialization
+    static Object doBuiltin(PBuiltinFunction descriptor, @SuppressWarnings("unused") Object receiver) {
+        return descriptor;
+    }
+
+    @Specialization
+    static Object doFunction(PFunction descriptor, @SuppressWarnings("unused") Object receiver) {
+        return descriptor;
+    }
+
+    protected static boolean needsToBind(Object descriptor) {
+        return !(descriptor == PNone.NO_VALUE || descriptor instanceof BuiltinMethodDescriptor || descriptor instanceof PBuiltinFunction || descriptor instanceof PFunction);
+    }
+
+    @Specialization(guards = "needsToBind(descriptor)")
+    static Object doBind(VirtualFrame frame, Object descriptor, Object receiver,
+                    @Cached GetClassNode getClassNode,
+                    @Cached LookupAttributeInMRONode.Dynamic lookupGet,
+                    @Cached CallTernaryMethodNode callGet) {
+        Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
+        if (getMethod != PNone.NO_VALUE) {
+            return new BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, getClassNode.execute(receiver)));
+        }
+        // CPython considers non-descriptors already bound
+        return new BoundDescriptor(descriptor);
+    }
+}
