use @GenerateUncached for our CallSpecialMethodNode

Author: timfel

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

@@ -58,7 +58,7 @@ public static CallQuaternaryMethodNode create() {
     public abstract Object execute(VirtualFrame frame, Object callable, Object arg1, Object arg2, Object arg3, Object arg4);
 
     @Specialization(guards = {"func == cachedFunc", "builtinNode != null", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
-    Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction func, Object arg1, Object arg2, Object arg3, Object arg4,
+    Object callSingle(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction func, Object arg1, Object arg2, Object arg3, Object arg4,
                     @SuppressWarnings("unused") @Cached("func") PBuiltinFunction cachedFunc,
                     @Cached("getQuaternary(frame, func)") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
@@ -75,7 +75,7 @@ Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction fun
 
     @Specialization(guards = {"func == cachedFunc", "builtinNode != null", "!takesSelfArg",
                     "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
-    Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object arg1, Object arg2, Object arg3, Object arg4,
+    Object callMethodSingle(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object arg1, Object arg2, Object arg3, Object arg4,
                     @SuppressWarnings("unused") @Cached("func") PBuiltinMethod cachedFunc,
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
@@ -84,16 +84,16 @@ Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func,
     }
 
     @Specialization(guards = {"builtinNode != null", "getCallTarget(func) == ct", "!takesSelfArg", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()")
-    Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object arg1, Object arg2, Object arg3, Object arg4,
+    Object callMethod(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object arg1, Object arg2, Object arg3, Object arg4,
                     @SuppressWarnings("unused") @Cached("getCallTarget(func)") RootCallTarget ct,
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
         return builtinNode.execute(frame, arg1, arg2, arg3, arg4);
     }
 
-    @Specialization
-    Object call(VirtualFrame frame, Object func, Object arg1, Object arg2, Object arg3, Object arg4,
+    @Specialization(replaces = {"callSingle", "call", "callMethodSingle", "callMethod"})
+    Object generic(VirtualFrame frame, Object func, Object arg1, Object arg2, Object arg3, Object arg4,
                     @Cached CallNode callNode) {
         return callNode.execute(frame, func, new Object[]{arg1, arg2, arg3, arg4}, PKeyword.EMPTY_KEYWORDS);
     }

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

@@ -62,6 +62,7 @@
 import com.oracle.truffle.api.dsl.GeneratedBy;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.NodeField;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -73,13 +74,16 @@
 @TypeSystemReference(PythonTypes.class)
 @ImportStatic(PythonOptions.class)
 @ReportPolymorphism
+@NodeField(name = "maxSizeExceeded", type = boolean.class)
 abstract class CallSpecialMethodNode extends Node {
 
     /**
-     * for interpreter performance: cache if we exceeded the max caller size. Never allow inlining
+     * for interpreter performance: cache if we exceeded the max caller size. We never allow inlining
      * in the uncached case.
      */
-    private boolean maxSizeExceeded = !isAdoptable();
+    protected abstract boolean isMaxSizeExceeded();
+
+    protected abstract void setMaxSizeExceeded(boolean value);
 
     /**
      * Returns a new instanceof the builtin if it's a subclass of the given class, and null
@@ -106,14 +110,14 @@ private <T extends PythonBuiltinBaseNode> T getBuiltin(VirtualFrame frame, PBuil
 
     private <T extends PythonBuiltinBaseNode> boolean callerExceedsMaxSize(T builtinNode) {
         CompilerAsserts.neverPartOfCompilation();
-        if (!maxSizeExceeded) {
+        if (isAdoptable() && !isMaxSizeExceeded()) {
             RootNode root = getRootNode();
             int n = root instanceof PRootNode ? ((PRootNode) root).getNodeCount() : NodeUtil.countNodes(root);
             // nb: option 'BuiltinsInliningMaxCallerSize' is defined as a compatible option, i.e.,
             // ASTs will only we shared between contexts that have the same value for this option.
             int maxSize = lookupContextReference(PythonLanguage.class).get().getOption(PythonOptions.BuiltinsInliningMaxCallerSize);
             if (n >= maxSize || n + NodeUtil.countNodes(builtinNode) >= maxSize) {
-                maxSizeExceeded = true;
+                setMaxSizeExceeded(true);
                 return true;
             }
             return false;