Adjust library limit for LookupAndCallUnaryNodes

Author: qunaibit

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

@@ -53,6 +53,8 @@
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
@@ -70,6 +72,7 @@
 // The (int, double) and (double, int) specializations are needed to avoid int->long conversion.
 // Although it would produce correct results, the special handling of long to double comparison
 // is slower than converting int->double, which is always correct.
+@ReportPolymorphism
 public abstract class LookupAndCallBinaryNode extends Node {
 
     public abstract static class NotImplementedHandler extends PNodeWithContext {
@@ -355,10 +358,11 @@ boolean callBoolean(VirtualFrame frame, double left, double right,
 
     @Specialization(guards = {"!isReversible()"}, limit = "2")
     Object callObject(VirtualFrame frame, Object left, Object right,
-                      @CachedLibrary("left") PythonObjectLibrary libLeft,
+                    @CachedLibrary("left") PythonObjectLibrary libLeft,
                     @Cached("create(name, ignoreDescriptorException)") LookupSpecialMethodNode getattr) {
+        Object leftClass = libLeft.getLazyPythonClass(left);
         Object leftValue = libLeft.getDelegatedValue(left);
-        Object leftCallable = getattr.execute(frame, libLeft.getLazyPythonClass(leftValue), leftValue);
+        Object leftCallable = getattr.execute(frame, leftClass, leftValue);
         if (leftCallable == PNone.NO_VALUE) {
             if (handlerFactory != null) {
                 return runErrorHandler(leftValue, right);

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

@@ -51,13 +51,16 @@
 import com.oracle.truffle.api.CompilerDirectives;
 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.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
+@ReportPolymorphism
 public abstract class LookupAndCallUnaryNode extends Node {
 
     public abstract static class NoAttributeHandler extends PNodeWithContext {
@@ -130,88 +133,88 @@ protected PythonUnaryBuiltinNode getBuiltin(Object receiver) {
     // int
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    int callInt(VirtualFrame frame, int receiver,
+    static int callInt(VirtualFrame frame, int receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeInt(frame, receiver);
     }
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    boolean callBool(VirtualFrame frame, int receiver,
+    static boolean callBool(VirtualFrame frame, int receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeBool(frame, receiver);
     }
 
     @Specialization(guards = "function != null")
-    Object callObject(VirtualFrame frame, int receiver,
+    static Object callObject(VirtualFrame frame, int receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) {
         return function.execute(frame, receiver);
     }
 
     // long
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    long callInt(VirtualFrame frame, long receiver,
+    static long callInt(VirtualFrame frame, long receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeLong(frame, receiver);
     }
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    boolean callBool(VirtualFrame frame, long receiver,
+    static boolean callBool(VirtualFrame frame, long receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeBool(frame, receiver);
     }
 
     @Specialization(guards = "function != null")
-    Object callObject(VirtualFrame frame, long receiver,
+    static Object callObject(VirtualFrame frame, long receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) {
         return function.execute(frame, receiver);
     }
 
     // double
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    double callInt(VirtualFrame frame, double receiver,
+    static double callInt(VirtualFrame frame, double receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeDouble(frame, receiver);
     }
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    boolean callBool(VirtualFrame frame, double receiver,
+    static boolean callBool(VirtualFrame frame, double receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeBool(frame, receiver);
     }
 
     @Specialization(guards = "function != null")
-    Object callObject(VirtualFrame frame, double receiver,
+    static Object callObject(VirtualFrame frame, double receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) {
         return function.execute(frame, receiver);
     }
 
     // bool
 
     @Specialization(guards = "function != null", rewriteOn = UnexpectedResultException.class)
-    boolean callBool(VirtualFrame frame, boolean receiver,
+    static boolean callBool(VirtualFrame frame, boolean receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) throws UnexpectedResultException {
         return function.executeBool(frame, receiver);
     }
 
     @Specialization(guards = "function != null")
-    Object callObject(VirtualFrame frame, boolean receiver,
+    static Object callObject(VirtualFrame frame, boolean receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) {
         return function.execute(frame, receiver);
     }
 
     // PNone
 
     @Specialization(guards = "function != null")
-    Object callObject(VirtualFrame frame, PNone receiver,
+    static Object callObject(VirtualFrame frame, PNone receiver,
                     @Cached("getBuiltin(receiver)") PythonUnaryBuiltinNode function) {
         return function.execute(frame, receiver);
     }
 
     // Object
 
-    @Specialization(limit = "3")
+    @Specialization
     Object callObject(VirtualFrame frame, Object receiver,
                     @CachedLibrary("receiver") PythonObjectLibrary lib,
                     @Cached("create(name, ignoreDescriptorException)") LookupSpecialMethodNode getattr,
@@ -236,7 +239,7 @@ public abstract static class LookupAndCallUnaryDynamicNode extends PNodeWithCont
 
         public abstract Object executeObject(Object receiver, String name);
 
-        @Specialization(limit = "3")
+        @Specialization(limit = "2")
         static Object doObject(Object receiver, String name,
                         @CachedLibrary("receiver") PythonObjectLibrary lib,
                         @Cached LookupSpecialMethodNode.Dynamic getattr,