Use LookupSpecialMethodNode for __init__

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -160,7 +160,6 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetAnyAttributeNode;
-import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
@@ -169,6 +168,7 @@
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
@@ -857,16 +857,16 @@ public PythonObject reversed(Object cls, String value) {
         @Specialization(guards = {"!isString(sequence)", "!isPRange(sequence)"}, limit = "3")
         public Object reversed(VirtualFrame frame, Object cls, Object sequence,
                         @CachedLibrary("sequence") PythonObjectLibrary lib,
-                        @Cached("create(__REVERSED__)") LookupAttributeInMRONode reversedNode,
+                        @Cached("create(__REVERSED__)") LookupSpecialMethodNode reversedNode,
                         @Cached("create()") CallUnaryMethodNode callReversedNode,
                         @Cached("create(__LEN__)") LookupAndCallUnaryNode lenNode,
-                        @Cached("create(__GETITEM__)") LookupAttributeInMRONode getItemNode,
+                        @Cached("create(__GETITEM__)") LookupSpecialMethodNode getItemNode,
                         @Cached("createBinaryProfile()") ConditionProfile noReversedProfile,
                         @Cached("createBinaryProfile()") ConditionProfile noGetItemProfile) {
             Object sequenceKlass = lib.getLazyPythonClass(sequence);
-            Object reversed = reversedNode.execute(sequenceKlass);
+            Object reversed = reversedNode.execute(frame, sequenceKlass, sequence);
             if (noReversedProfile.profile(reversed == PNone.NO_VALUE)) {
-                Object getItem = getItemNode.execute(sequenceKlass);
+                Object getItem = getItemNode.execute(frame, sequenceKlass, sequence);
                 if (noGetItemProfile.profile(getItem == PNone.NO_VALUE)) {
                     throw raise(TypeError, ErrorMessages.OBJ_ISNT_REVERSIBLE, sequence);
                 } else {

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

@@ -99,6 +99,7 @@
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
 import com.oracle.graal.python.nodes.classes.AbstractObjectGetBasesNode;
 import com.oracle.graal.python.nodes.classes.AbstractObjectIsSubclassNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
@@ -205,7 +206,7 @@ public abstract static class CallNode extends PythonVarargsBuiltinNode {
         @Child private LookupAndCallTernaryNode callNewGet = LookupAndCallTernaryNode.create(__GET__);
         @Child private LookupAttributeInMRONode lookupNew = LookupAttributeInMRONode.create(__NEW__);
         @Child private CallVarargsMethodNode dispatchInit = CallVarargsMethodNode.create();
-        @Child private LookupAttributeInMRONode lookupInit = LookupAttributeInMRONode.create(__INIT__);
+        @Child private LookupSpecialMethodNode lookupInit = LookupSpecialMethodNode.create(__INIT__);
         @Child private IsSubtypeNode isSubTypeNode;
         @Child private TypeNodes.GetNameNode getNameNode;
         @Child private IsBuiltinClassProfile isClassClassProfile = IsBuiltinClassProfile.create();
@@ -360,7 +361,7 @@ private Object op(VirtualFrame frame, Object self, Object[] arguments, PKeyword[
                         // passing keywords or more than one argument see:
                         // https://github.com/python/cpython/blob/2102c789035ccacbac4362589402ac68baa2cd29/Objects/typeobject.c#L3538
                     } else {
-                        Object initMethod = lookupInit.execute(newInstanceKlass);
+                        Object initMethod = lookupInit.execute(frame, newInstanceKlass, newInstance);
                         if (initMethod != PNone.NO_VALUE) {
                             Object[] initArgs;
                             if (doCreateArgs) {

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

@@ -84,6 +84,10 @@ public static LookupSpecialMethodNode create(String name, boolean ignoreDescript
         return LookupSpecialMethodNodeGen.create(name, ignoreDescriptorException);
     }
 
+    public static LookupSpecialMethodNode create(String name) {
+        return LookupSpecialMethodNodeGen.create(name, false);
+    }
+
     public static class BoundDescriptor {
         public final Object descriptor;