Use new lookup and call in lengthWithState

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -115,7 +115,6 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
-import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.LookupAndCallUnaryDynamicNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
@@ -642,22 +641,20 @@ public boolean isSequence(@CachedLibrary("this") PythonObjectLibrary plib,
 
     @ExportMessage
     public int lengthWithState(ThreadState state,
+                    @CachedLibrary("this") PythonObjectLibrary plib,
+                    @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib,
                     @Shared("gotState") @Cached ConditionProfile gotState,
                     @Exclusive @Cached ConditionProfile hasLen,
                     @Exclusive @Cached ConditionProfile ltZero,
-                    @Exclusive @Cached LookupInheritedAttributeNode.Dynamic getLenNode,
-                    @Exclusive @Cached CallUnaryMethodNode callNode,
                     @Shared("raise") @Cached PRaiseNode raiseNode,
                     @Exclusive @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
-        Object lenFunc = getLenNode.execute(this, __LEN__);
+        Object lenFunc = plib.lookupAttributeOnType(this, __LEN__);
         if (hasLen.profile(lenFunc != PNone.NO_VALUE)) {
-            Object lenResult;
+            Object lenResult = methodLib.callUnboundMethodWithState(lenFunc, state, this);
             int len;
             if (gotState.profile(state == null)) {
-                lenResult = callNode.executeObject(lenFunc, this);
                 len = lib.asSize(lenResult);
             } else {
-                lenResult = callNode.executeObject(PArguments.frameForCall(state), lenFunc, this);
                 len = lib.asSizeWithState(lenResult, state);
             }
             if (ltZero.profile(len < 0)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java

@@ -36,7 +36,6 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
@@ -166,15 +165,15 @@ static int nativeStringMat(PString self, @SuppressWarnings("unused") ThreadState
 
         @Specialization(replaces = {"string", "lazyString", "nativeString", "nativeStringMat"})
         static int subclassedString(PString self, ThreadState state,
-                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState,
-                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile hasLen,
-                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile ltZero,
-                        @Exclusive @Cached LookupInheritedAttributeNode.Dynamic getLenNode,
-                        @Exclusive @Cached CallUnaryMethodNode callNode,
-                        @Exclusive @Cached PRaiseNode raiseNode,
+                        @CachedLibrary("self") PythonObjectLibrary plib,
+                        @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib,
+                        @Shared("gotState") @Cached ConditionProfile gotState,
+                        @Exclusive @Cached ConditionProfile hasLen,
+                        @Exclusive @Cached ConditionProfile ltZero,
+                        @Shared("raise") @Cached PRaiseNode raiseNode,
                         @Exclusive @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
             // call the generic implementation in the superclass
-            return self.lengthWithState(state, gotState, hasLen, ltZero, getLenNode, callNode, raiseNode, lib);
+            return self.lengthWithState(state, plib, methodLib, gotState, hasLen, ltZero, raiseNode, lib);
         }
     }