remove indirection through PythonQuaternaryBuiltinNode.call

lukasstadler · lukasstadler · commit c27d92afed4b · 2021-09-30T12:40:51.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java
@@ -1089,7 +1089,7 @@ abstract static class UTF8DecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-8", errors, ffinal);
+            return decode.execute(frame, obj, "utf-8", errors, ffinal);
         }
     }
 
@@ -1109,7 +1109,7 @@ abstract static class UTF7DecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-7", errors, ffinal);
+            return decode.execute(frame, obj, "utf-7", errors, ffinal);
         }
     }
 
@@ -1129,7 +1129,7 @@ abstract static class UTF16DecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-16", errors, ffinal);
+            return decode.execute(frame, obj, "utf-16", errors, ffinal);
         }
     }
 
@@ -1149,7 +1149,7 @@ abstract static class UTF16LEDecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-16-le", errors, ffinal);
+            return decode.execute(frame, obj, "utf-16-le", errors, ffinal);
         }
     }
 
@@ -1169,7 +1169,7 @@ abstract static class UTF16BEDecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-16-be", errors, ffinal);
+            return decode.execute(frame, obj, "utf-16-be", errors, ffinal);
         }
     }
 
@@ -1199,7 +1199,7 @@ abstract static class UTF32DecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-32", errors, ffinal);
+            return decode.execute(frame, obj, "utf-32", errors, ffinal);
         }
     }
 
@@ -1219,7 +1219,7 @@ abstract static class UTF32LEDecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-32-le", errors, ffinal);
+            return decode.execute(frame, obj, "utf-32-le", errors, ffinal);
         }
     }
 
@@ -1239,7 +1239,7 @@ abstract static class UTF32BEDecodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "utf-32-be", errors, ffinal);
+            return decode.execute(frame, obj, "utf-32-be", errors, ffinal);
         }
     }
 
@@ -1289,7 +1289,7 @@ abstract static class RawUnicodeEscapeDecodeNode extends PythonBinaryBuiltinNode
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "raw_unicode_escape", errors, true);
+            return decode.execute(frame, obj, "raw_unicode_escape", errors, true);
         }
     }
 
@@ -1309,7 +1309,7 @@ abstract static class UnicodeEscapeDecodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "unicode_escape", errors, true);
+            return decode.execute(frame, obj, "unicode_escape", errors, true);
         }
     }
 
@@ -1329,7 +1329,7 @@ abstract static class Latin1EscapeDecodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "latin_1", errors, true);
+            return decode.execute(frame, obj, "latin_1", errors, true);
         }
     }
 
@@ -1349,7 +1349,7 @@ abstract static class AsciiDecodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object decode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, obj, "ascii", errors, true);
+            return decode.execute(frame, obj, "ascii", errors, true);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java
@@ -369,7 +369,7 @@ protected abstract static class CodecDecodeNode extends PythonTernaryBuiltinNode
         Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors,
                         @Cached PyObjectGetAttr getAttrNode,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, true);
+            return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, true);
         }
     }
 
@@ -393,7 +393,7 @@ protected abstract static class IncrementalDecodeNode extends PythonQuaternaryBu
         Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors, Object ffinal,
                         @Cached PyObjectGetAttr getAttrNode,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);
+            return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);
         }
     }
 
@@ -404,7 +404,7 @@ protected abstract static class StreamDecodeNode extends PythonQuaternaryBuiltin
         Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors, Object ffinal,
                         @Cached PyObjectGetAttr getAttrNode,
                         @Cached CodecsDecodeNode decode) {
-            return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);
+            return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/StringIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/StringIOBuiltins.java
@@ -281,7 +281,7 @@ PNone init(VirtualFrame frame, PStringIO self, String initialValue, Object newli
 
             if (self.isReadUniversal()) {
                 Object incDecoder = factory().createNLDecoder(PIncrementalNewlineDecoder);
-                initNode.call(frame, incDecoder, self.getDecoder(), self.isReadTranslate(), PNone.NO_VALUE);
+                initNode.execute(frame, incDecoder, self.getDecoder(), self.isReadTranslate(), PNone.NO_VALUE);
                 self.setDecoder(incDecoder);
             }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallBinaryMethodNode.java
@@ -220,7 +220,7 @@ static Object callQuaternaryFunction(VirtualFrame frame, @SuppressWarnings("unus
                     @SuppressWarnings("unused") @Cached("getMinArgs(func)") int minArgs,
                     @Cached("getQuaternary(frame, func)") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, arg1, arg2, PNone.NO_VALUE, PNone.NO_VALUE);
+        return builtinNode.execute(frame, arg1, arg2, PNone.NO_VALUE, PNone.NO_VALUE);
     }
 
     @Specialization(guards = "!isBinaryOrTernaryBuiltinDescriptor(func)", //
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallQuaternaryMethodNode.java
@@ -68,15 +68,15 @@ Object callSingle(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFuncti
                     @SuppressWarnings("unused") @Cached("func") PBuiltinFunction cachedFunc,
                     @Cached("getQuaternary(frame, func)") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, arg1, arg2, arg3, arg4);
+        return builtinNode.execute(frame, arg1, arg2, arg3, arg4);
     }
 
     @Specialization(guards = {"func.getCallTarget() == ct", "builtinNode != null", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()")
     Object call(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction func, Object arg1, Object arg2, Object arg3, Object arg4,
                     @SuppressWarnings("unused") @Cached("func.getCallTarget()") RootCallTarget ct,
                     @Cached("getQuaternary(frame, func)") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, arg1, arg2, arg3, arg4);
+        return builtinNode.execute(frame, arg1, arg2, arg3, arg4);
     }
 
     @Specialization(guards = {"func == cachedFunc", "builtinNode != null", "!takesSelfArg",
@@ -86,7 +86,7 @@ Object callMethodSingle(VirtualFrame frame, @SuppressWarnings("unused") PBuiltin
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, arg1, arg2, arg3, arg4);
+        return builtinNode.execute(frame, arg1, arg2, arg3, arg4);
     }
 
     @Specialization(guards = {"builtinNode != null", "getCallTarget(func, getCt) == ct", "!takesSelfArg", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()")
@@ -96,7 +96,7 @@ Object callMethod(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, arg1, arg2, arg3, arg4);
+        return builtinNode.execute(frame, arg1, arg2, arg3, arg4);
     }
 
     @Specialization(replaces = {"callSingle", "call", "callMethodSingle", "callMethod"})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallTernaryMethodNode.java
@@ -156,7 +156,7 @@ static Object callSelfMethodSingleContext(VirtualFrame frame, @SuppressWarnings(
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, func.getSelf(), arg1, arg2, arg3);
+        return builtinNode.execute(frame, func.getSelf(), arg1, arg2, arg3);
     }
 
     @Specialization(guards = {"builtinNode != null", "getCallTarget(func, getCt) == ct", "takesSelfArg", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()")
@@ -166,7 +166,7 @@ static Object callSelfMethod(VirtualFrame frame, @SuppressWarnings("unused") PBu
                     @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
                     @Cached("getQuaternary(frame, func.getFunction())") PythonQuaternaryBuiltinNode builtinNode,
                     @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
-        return builtinNode.call(frame, func.getSelf(), arg1, arg2, arg3);
+        return builtinNode.execute(frame, func.getSelf(), arg1, arg2, arg3);
     }
 
     @Specialization(guards = "!isTernaryBuiltinDescriptor(func)", replaces = {"doBuiltinFunctionCached", "doBuiltinFunctionCtCached", "doBuiltinFunctionCachedReverse",
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/BuiltinCallNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/BuiltinCallNode.java
@@ -153,7 +153,7 @@ public BuiltinQuaternaryCallNode(PythonQuaternaryBuiltinNode node, ReadArgumentN
 
         @Override
         public Object execute(VirtualFrame frame) {
-            return node.call(frame, arg1.execute(frame), arg2.execute(frame), arg3.execute(frame), arg4.execute(frame));
+            return node.execute(frame, arg1.execute(frame), arg2.execute(frame), arg3.execute(frame), arg4.execute(frame));
         }
 
         @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryBuiltinNode.java
@@ -44,9 +44,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public abstract class PythonQuaternaryBuiltinNode extends PythonBuiltinBaseNode {
-    public Object call(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {
-        return execute(frame, arg, arg2, arg3, arg4);
-    }
 
-    protected abstract Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4);
+    public abstract Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4);
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryClinicBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonQuaternaryClinicBuiltinNode.java
@@ -92,13 +92,15 @@ private Object cast3WithNode(ArgumentClinicProvider clinic, VirtualFrame frame,
         return castNode3.execute(frame, value);
     }
 
+    protected abstract Object executeWithoutClinic(VirtualFrame frame, Object val, Object val2, Object val3, Object val4);
+
     @Override
-    public final Object call(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {
+    public final Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {
         ArgumentClinicProvider clinic = getArgumentClinic();
         Object val = clinic.hasCastNode(0) ? cast0WithNode(clinic, frame, arg) : arg;
         Object val2 = clinic.hasCastNode(1) ? cast1WithNode(clinic, frame, arg2) : arg2;
         Object val3 = clinic.hasCastNode(2) ? cast2WithNode(clinic, frame, arg3) : arg3;
         Object val4 = clinic.hasCastNode(3) ? cast3WithNode(clinic, frame, arg4) : arg4;
-        return super.call(frame, val, val2, val3, val4);
+        return executeWithoutClinic(frame, val, val2, val3, val4);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1089,7 +1089,7 @@ abstract static class UTF8DecodeNode extends PythonTernaryBuiltinNode {`
`1089`	`1089`	`@Specialization`
`1090`	`1090`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1091`	`1091`	`@Cached CodecsDecodeNode decode) {`
`1092`		`- return decode.call(frame, obj, "utf-8", errors, ffinal);`
	`1092`	`+ return decode.execute(frame, obj, "utf-8", errors, ffinal);`
`1093`	`1093`	`}`
`1094`	`1094`	`}`
`1095`	`1095`
`@@ -1109,7 +1109,7 @@ abstract static class UTF7DecodeNode extends PythonTernaryBuiltinNode {`
`1109`	`1109`	`@Specialization`
`1110`	`1110`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1111`	`1111`	`@Cached CodecsDecodeNode decode) {`
`1112`		`- return decode.call(frame, obj, "utf-7", errors, ffinal);`
	`1112`	`+ return decode.execute(frame, obj, "utf-7", errors, ffinal);`
`1113`	`1113`	`}`
`1114`	`1114`	`}`
`1115`	`1115`
`@@ -1129,7 +1129,7 @@ abstract static class UTF16DecodeNode extends PythonTernaryBuiltinNode {`
`1129`	`1129`	`@Specialization`
`1130`	`1130`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1131`	`1131`	`@Cached CodecsDecodeNode decode) {`
`1132`		`- return decode.call(frame, obj, "utf-16", errors, ffinal);`
	`1132`	`+ return decode.execute(frame, obj, "utf-16", errors, ffinal);`
`1133`	`1133`	`}`
`1134`	`1134`	`}`
`1135`	`1135`
`@@ -1149,7 +1149,7 @@ abstract static class UTF16LEDecodeNode extends PythonTernaryBuiltinNode {`
`1149`	`1149`	`@Specialization`
`1150`	`1150`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1151`	`1151`	`@Cached CodecsDecodeNode decode) {`
`1152`		`- return decode.call(frame, obj, "utf-16-le", errors, ffinal);`
	`1152`	`+ return decode.execute(frame, obj, "utf-16-le", errors, ffinal);`
`1153`	`1153`	`}`
`1154`	`1154`	`}`
`1155`	`1155`
`@@ -1169,7 +1169,7 @@ abstract static class UTF16BEDecodeNode extends PythonTernaryBuiltinNode {`
`1169`	`1169`	`@Specialization`
`1170`	`1170`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1171`	`1171`	`@Cached CodecsDecodeNode decode) {`
`1172`		`- return decode.call(frame, obj, "utf-16-be", errors, ffinal);`
	`1172`	`+ return decode.execute(frame, obj, "utf-16-be", errors, ffinal);`
`1173`	`1173`	`}`
`1174`	`1174`	`}`
`1175`	`1175`
`@@ -1199,7 +1199,7 @@ abstract static class UTF32DecodeNode extends PythonTernaryBuiltinNode {`
`1199`	`1199`	`@Specialization`
`1200`	`1200`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1201`	`1201`	`@Cached CodecsDecodeNode decode) {`
`1202`		`- return decode.call(frame, obj, "utf-32", errors, ffinal);`
	`1202`	`+ return decode.execute(frame, obj, "utf-32", errors, ffinal);`
`1203`	`1203`	`}`
`1204`	`1204`	`}`
`1205`	`1205`
`@@ -1219,7 +1219,7 @@ abstract static class UTF32LEDecodeNode extends PythonTernaryBuiltinNode {`
`1219`	`1219`	`@Specialization`
`1220`	`1220`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1221`	`1221`	`@Cached CodecsDecodeNode decode) {`
`1222`		`- return decode.call(frame, obj, "utf-32-le", errors, ffinal);`
	`1222`	`+ return decode.execute(frame, obj, "utf-32-le", errors, ffinal);`
`1223`	`1223`	`}`
`1224`	`1224`	`}`
`1225`	`1225`
`@@ -1239,7 +1239,7 @@ abstract static class UTF32BEDecodeNode extends PythonTernaryBuiltinNode {`
`1239`	`1239`	`@Specialization`
`1240`	`1240`	`Object encode(VirtualFrame frame, Object obj, Object errors, Object ffinal,`
`1241`	`1241`	`@Cached CodecsDecodeNode decode) {`
`1242`		`- return decode.call(frame, obj, "utf-32-be", errors, ffinal);`
	`1242`	`+ return decode.execute(frame, obj, "utf-32-be", errors, ffinal);`
`1243`	`1243`	`}`
`1244`	`1244`	`}`
`1245`	`1245`
`@@ -1289,7 +1289,7 @@ abstract static class RawUnicodeEscapeDecodeNode extends PythonBinaryBuiltinNode`
`1289`	`1289`	`@Specialization`
`1290`	`1290`	`Object encode(VirtualFrame frame, Object obj, Object errors,`
`1291`	`1291`	`@Cached CodecsDecodeNode decode) {`
`1292`		`- return decode.call(frame, obj, "raw_unicode_escape", errors, true);`
	`1292`	`+ return decode.execute(frame, obj, "raw_unicode_escape", errors, true);`
`1293`	`1293`	`}`
`1294`	`1294`	`}`
`1295`	`1295`
`@@ -1309,7 +1309,7 @@ abstract static class UnicodeEscapeDecodeNode extends PythonBinaryBuiltinNode {`
`1309`	`1309`	`@Specialization`
`1310`	`1310`	`Object encode(VirtualFrame frame, Object obj, Object errors,`
`1311`	`1311`	`@Cached CodecsDecodeNode decode) {`
`1312`		`- return decode.call(frame, obj, "unicode_escape", errors, true);`
	`1312`	`+ return decode.execute(frame, obj, "unicode_escape", errors, true);`
`1313`	`1313`	`}`
`1314`	`1314`	`}`
`1315`	`1315`
`@@ -1329,7 +1329,7 @@ abstract static class Latin1EscapeDecodeNode extends PythonBinaryBuiltinNode {`
`1329`	`1329`	`@Specialization`
`1330`	`1330`	`Object encode(VirtualFrame frame, Object obj, Object errors,`
`1331`	`1331`	`@Cached CodecsDecodeNode decode) {`
`1332`		`- return decode.call(frame, obj, "latin_1", errors, true);`
	`1332`	`+ return decode.execute(frame, obj, "latin_1", errors, true);`
`1333`	`1333`	`}`
`1334`	`1334`	`}`
`1335`	`1335`
`@@ -1349,7 +1349,7 @@ abstract static class AsciiDecodeNode extends PythonBinaryBuiltinNode {`
`1349`	`1349`	`@Specialization`
`1350`	`1350`	`Object decode(VirtualFrame frame, Object obj, Object errors,`
`1351`	`1351`	`@Cached CodecsDecodeNode decode) {`
`1352`		`- return decode.call(frame, obj, "ascii", errors, true);`
	`1352`	`+ return decode.execute(frame, obj, "ascii", errors, true);`
`1353`	`1353`	`}`
`1354`	`1354`	`}`
`1355`	`1355`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ protected abstract static class CodecDecodeNode extends PythonTernaryBuiltinNode`
`369`	`369`	`Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors,`
`370`	`370`	`@Cached PyObjectGetAttr getAttrNode,`
`371`	`371`	`@Cached CodecsDecodeNode decode) {`
`372`		`- return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, true);`
	`372`	`+ return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, true);`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`
`@@ -393,7 +393,7 @@ protected abstract static class IncrementalDecodeNode extends PythonQuaternaryBu`
`393`	`393`	`Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors, Object ffinal,`
`394`	`394`	`@Cached PyObjectGetAttr getAttrNode,`
`395`	`395`	`@Cached CodecsDecodeNode decode) {`
`396`		`- return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);`
	`396`	`+ return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`
`@@ -404,7 +404,7 @@ protected abstract static class StreamDecodeNode extends PythonQuaternaryBuiltin`
`404`	`404`	`Object decode(VirtualFrame frame, PythonObject self, Object input, Object errors, Object ffinal,`
`405`	`405`	`@Cached PyObjectGetAttr getAttrNode,`
`406`	`406`	`@Cached CodecsDecodeNode decode) {`
`407`		`- return decode.call(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);`
	`407`	`+ return decode.execute(frame, input, getAttrNode.execute(frame, self, ATTR_ENCODING), errors, ffinal);`
`408`	`408`	`}`
`409`	`409`	`}`
`410`	`410`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ PNone init(VirtualFrame frame, PStringIO self, String initialValue, Object newli`
`281`	`281`
`282`	`282`	`if (self.isReadUniversal()) {`
`283`	`283`	`Object incDecoder = factory().createNLDecoder(PIncrementalNewlineDecoder);`
`284`		`- initNode.call(frame, incDecoder, self.getDecoder(), self.isReadTranslate(), PNone.NO_VALUE);`
	`284`	`+ initNode.execute(frame, incDecoder, self.getDecoder(), self.isReadTranslate(), PNone.NO_VALUE);`
`285`	`285`	`self.setDecoder(incDecoder);`
`286`	`286`	`}`
`287`	`287`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static Object callQuaternaryFunction(VirtualFrame frame, @SuppressWarnings("unus`
`220`	`220`	`@SuppressWarnings("unused") @Cached("getMinArgs(func)") int minArgs,`
`221`	`221`	`@Cached("getQuaternary(frame, func)") PythonQuaternaryBuiltinNode builtinNode,`
`222`	`222`	`@SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {`
`223`		`- return builtinNode.call(frame, arg1, arg2, PNone.NO_VALUE, PNone.NO_VALUE);`
	`223`	`+ return builtinNode.execute(frame, arg1, arg2, PNone.NO_VALUE, PNone.NO_VALUE);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`@Specialization(guards = "!isBinaryOrTernaryBuiltinDescriptor(func)", //`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public BuiltinQuaternaryCallNode(PythonQuaternaryBuiltinNode node, ReadArgumentN`
`153`	`153`
`154`	`154`	`@Override`
`155`	`155`	`public Object execute(VirtualFrame frame) {`
`156`		`- return node.call(frame, arg1.execute(frame), arg2.execute(frame), arg3.execute(frame), arg4.execute(frame));`
	`156`	`+ return node.execute(frame, arg1.execute(frame), arg2.execute(frame), arg3.execute(frame), arg4.execute(frame));`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@`
`44`	`44`	`import com.oracle.truffle.api.frame.VirtualFrame;`
`45`	`45`
`46`	`46`	`public abstract class PythonQuaternaryBuiltinNode extends PythonBuiltinBaseNode {`
`47`		`- public Object call(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {`
`48`		`- return execute(frame, arg, arg2, arg3, arg4);`
`49`		`- }`
`50`	`47`
`51`		`- protected abstract Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4);`
	`48`	`+ public abstract Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4);`
`52`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,15 @@ private Object cast3WithNode(ArgumentClinicProvider clinic, VirtualFrame frame,`
`92`	`92`	`return castNode3.execute(frame, value);`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ protected abstract Object executeWithoutClinic(VirtualFrame frame, Object val, Object val2, Object val3, Object val4);`
	`96`	`+`
`95`	`97`	`@Override`
`96`		`- public final Object call(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {`
	`98`	`+ public final Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3, Object arg4) {`
`97`	`99`	`ArgumentClinicProvider clinic = getArgumentClinic();`
`98`	`100`	`Object val = clinic.hasCastNode(0) ? cast0WithNode(clinic, frame, arg) : arg;`
`99`	`101`	`Object val2 = clinic.hasCastNode(1) ? cast1WithNode(clinic, frame, arg2) : arg2;`
`100`	`102`	`Object val3 = clinic.hasCastNode(2) ? cast2WithNode(clinic, frame, arg3) : arg3;`
`101`	`103`	`Object val4 = clinic.hasCastNode(3) ? cast3WithNode(clinic, frame, arg4) : arg4;`
`102`		`- return super.call(frame, val, val2, val3, val4);`
	`104`	`+ return executeWithoutClinic(frame, val, val2, val3, val4);`
`103`	`105`	`}`
`104`	`106`	`}`