Fix method lookup in FormatProcessor

Author: msimacek

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

@@ -46,7 +46,6 @@
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -124,10 +123,6 @@ public static LookupAndCallBinaryNode create(SpecialMethodSlot slot, SpecialMeth
         return LookupAndCallReversibleBinaryNodeGen.create(slot, rslot, null, alwaysCheckReverse, ignoreDescriptorException);
     }
 
-    protected static Object getMethod(Object receiver, TruffleString methodName) {
-        return LookupSpecialMethodNode.Dynamic.executeUncached(null, GetClassNode.executeUncached(receiver), methodName, receiver);
-    }
-
     @ImportStatic(PGuards.class)
     @GenerateInline
     @GenerateCached(false)

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

@@ -87,8 +87,8 @@ public abstract static class Dynamic extends Node {
 
         public abstract Object execute(Frame frame, Node inliningTarget, Object type, TruffleString name, Object receiver);
 
-        public static Object executeUncached(Frame frame, Object type, TruffleString name, Object receiver) {
-            return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(frame, null, type, name, receiver);
+        public static Object executeUncached(Object type, TruffleString name, Object receiver) {
+            return LookupSpecialMethodNodeGen.DynamicNodeGen.getUncached().execute(null, null, type, name, receiver);
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/FormatProcessor.java

@@ -31,8 +31,8 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNodeGen;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -94,7 +94,7 @@ <F extends InternalFormat.Formatter> F setupFormat(F f) {
     protected abstract boolean isMapping(Object obj);
 
     static Object lookupAttribute(Object owner, TruffleString name) {
-        return LookupAttributeInMRONode.Dynamic.getUncached().execute(GetClassNode.executeUncached(owner), name);
+        return LookupSpecialMethodNode.Dynamic.executeUncached(GetClassNode.executeUncached(owner), name, owner);
     }
 
     static Object call(Object callable, Object... args) {