Use MaybeBindDescriptorNode in Dynamic special method lookup

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyLongAsIntNode.java

@@ -42,15 +42,12 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OverflowError;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -61,7 +58,6 @@
  * overflow.
  */
 @GenerateUncached
-@ImportStatic({PGuards.class, PythonBuiltinClassType.class})
 public abstract class PyLongAsIntNode extends PNodeWithContext {
     public abstract int execute(Frame frame, Object object);
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyLongAsLongNode.java

@@ -42,15 +42,12 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OverflowError;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -61,7 +58,6 @@
  * overflow.
  */
 @GenerateUncached
-@ImportStatic({PGuards.class, PythonBuiltinClassType.class})
 public abstract class PyLongAsLongNode extends PNodeWithContext {
     public abstract long execute(Frame frame, Object object);
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberFloatNode.java

@@ -47,12 +47,12 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
-import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodSlotNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
@@ -72,7 +72,7 @@
  * integer wouldn't fit into double.
  */
 @GenerateUncached
-@ImportStatic({PGuards.class, PythonBuiltinClassType.class})
+@ImportStatic(SpecialMethodSlot.class)
 public abstract class PyNumberFloatNode extends PNodeWithContext {
     public abstract double execute(Frame frame, Object object);
 
@@ -99,7 +99,7 @@ static double doBoolean(boolean object) {
     @Specialization(guards = {"!isDouble(object)", "!isInteger(object)", "!isBoolean(object)"})
     static double doObject(VirtualFrame frame, Object object,
                     @Cached GetClassNode getClassNode,
-                    @Cached LookupSpecialMethodNode.Dynamic lookup,
+                    @Cached(parameters = "Float") LookupSpecialMethodSlotNode lookup,
                     @Cached CallUnaryMethodNode call,
                     @Cached GetClassNode resultClassNode,
                     @Cached IsBuiltinClassProfile resultProfile,
@@ -110,7 +110,7 @@ static double doObject(VirtualFrame frame, Object object,
                     @Cached WarningsModuleBuiltins.WarnNode warnNode,
                     @Cached PRaiseNode raiseNode,
                     @Cached PyFloatFromString fromString) {
-        Object floatDescr = lookup.execute(frame, getClassNode.execute(object), __FLOAT__, object);
+        Object floatDescr = lookup.execute(frame, getClassNode.execute(object), object);
         if (floatDescr != PNone.NO_VALUE) {
             Object result = call.executeObject(frame, floatDescr, object);
             Object resultType = resultClassNode.execute(result);

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

@@ -40,13 +40,7 @@
  */
 package com.oracle.graal.python.nodes.call.special;
 
-import com.oracle.graal.python.builtins.objects.PNone;
-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.LookupAttributeInMRONode;
-import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -94,20 +88,10 @@ public static Dynamic getUncached() {
 
         @Specialization
         Object lookup(VirtualFrame frame, Object type, String name, Object receiver,
-                        @Cached LookupAttributeInMRONode.Dynamic lookupAttr,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupGet,
-                        @Cached CallNode callGet) {
+                        @Cached MaybeBindDescriptorNode bind,
+                        @Cached LookupAttributeInMRONode.Dynamic lookupAttr) {
             Object descriptor = lookupAttr.execute(type, name);
-            if (descriptor == PNone.NO_VALUE || descriptor instanceof PBuiltinFunction || descriptor instanceof PFunction) {
-                // Return unbound to avoid constructing the bound object
-                return descriptor;
-            }
-            Object getMethod = lookupGet.execute(descriptor, SpecialMethodNames.__GET__);
-            if (getMethod != PNone.NO_VALUE) {
-                return new MaybeBindDescriptorNode.BoundDescriptor(callGet.execute(frame, getMethod, descriptor, receiver, type));
-            }
-            // CPython considers non-descriptors already bound
-            return new MaybeBindDescriptorNode.BoundDescriptor(descriptor);
+            return bind.execute(frame, descriptor, receiver, type);
         }
     }
 }