[GR-34169] Simplify builtin nodes (remove "call" indirection).

PullRequest: graalpython/1982

Author: lukasstadler

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/ClinicTests.java

@@ -193,7 +193,7 @@ protected BinaryBuiltinRoot(PythonBinaryClinicBuiltinNode node) {
         @Override
         public Object execute(VirtualFrame frame) {
             try {
-                return node.call(frame, frame.getArguments()[0], frame.getArguments()[1]);
+                return node.execute(frame, frame.getArguments()[0], frame.getArguments()[1]);
             } catch (PException ex) {
                 boolean expectTypeError = frame.getArguments().length >= 3 && (boolean) frame.getArguments()[2];
                 if (expectTypeError) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ArrayModuleBuiltins.java

@@ -65,7 +65,6 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
-import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.SplitArgsNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -194,20 +193,19 @@ PArray arrayWithRangeInitializer(Object cls, String typeCode, PIntRange range,
             PArray arrayWithBytesInitializer(VirtualFrame frame, Object cls, String typeCode, PBytesLike bytes,
                             @Cached ArrayBuiltins.FromBytesNode fromBytesNode) {
                 PArray array = getFactory().createArray(cls, typeCode, getFormatChecked(typeCode));
-                fromBytesNode.execute(frame, array, bytes);
+                fromBytesNode.executeWithoutClinic(frame, array, bytes);
                 return array;
             }
 
             @Specialization(guards = "isString(initializer)")
             PArray arrayWithStringInitializer(VirtualFrame frame, Object cls, String typeCode, Object initializer,
-                            @Cached CastToJavaStringNode cast,
                             @Cached ArrayBuiltins.FromUnicodeNode fromUnicodeNode) {
                 BufferFormat format = getFormatChecked(typeCode);
                 if (format != BufferFormat.UNICODE) {
                     throw raise(TypeError, "cannot use a str to initialize an array with typecode '%s'", typeCode);
                 }
                 PArray array = getFactory().createArray(cls, typeCode, format);
-                fromUnicodeNode.execute(frame, array, cast.execute(initializer));
+                fromUnicodeNode.execute(frame, array, initializer);
                 return array;
             }
 
@@ -366,17 +364,17 @@ private Object doReconstruct(VirtualFrame frame, Object arrayType, String typeCo
                 PArray array;
                 if (machineFormat == MachineFormat.forFormat(format)) {
                     array = factory().createArray(arrayType, typeCode, machineFormat.format);
-                    fromBytesNode.execute(frame, array, bytes);
+                    fromBytesNode.executeWithoutClinic(frame, array, bytes);
                 } else {
                     String newTypeCode = machineFormat.format == format ? typeCode : machineFormat.format.baseTypeCode;
                     array = factory().createArray(arrayType, newTypeCode, machineFormat.format);
                     if (machineFormat.unicodeEncoding != null) {
                         Object decoded = callDecode.execute(frame, bytes, "decode", machineFormat.unicodeEncoding);
                         fromUnicodeNode.execute(frame, array, decoded);
                     } else {
-                        fromBytesNode.execute(frame, array, bytes);
+                        fromBytesNode.executeWithoutClinic(frame, array, bytes);
                         if (machineFormat.order != ByteOrder.nativeOrder()) {
-                            byteSwapNode.call(frame, array);
+                            byteSwapNode.execute(frame, array);
                         }
                     }
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -2391,7 +2391,7 @@ private PythonClass typeMetaclass(VirtualFrame frame, PythonLanguage language, S
                     // Check valid slot name
                     if (element instanceof String) {
                         slotName = (String) element;
-                        if (!(boolean) isIdentifier.call(frame, slotName)) {
+                        if (!(boolean) isIdentifier.execute(frame, slotName)) {
                             throw raise(TypeError, ErrorMessages.SLOTS_MUST_BE_IDENTIFIERS);
                         }
                     } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java

@@ -541,7 +541,10 @@ Object encode(Object str, @SuppressWarnings("unused") Object encoding, @Suppress
     @ArgumentClinic(name = "final", conversion = ArgumentClinic.ClinicConversion.Boolean, defaultValue = "false", useDefaultForNone = true)
     @GenerateNodeFactory
     public abstract static class CodecsDecodeNode extends PythonQuaternaryClinicBuiltinNode {
-        public abstract Object execute(Object input, Object encoding, Object errors, Object finalData);
+
+        public final Object call(VirtualFrame frame, Object input, Object encoding, Object errors, Object finalData) {
+            return execute(frame, input, encoding, errors, finalData);
+        }
 
         @Override
         protected ArgumentClinicProvider getArgumentClinic() {
@@ -827,7 +830,7 @@ PTuple lookup(VirtualFrame frame, PBytesLike encoding,
                         @Cached ConditionProfile hasSearchPathProfile,
                         @Cached ConditionProfile hasTruffleEncodingProfile,
                         @Cached ConditionProfile isTupleProfile) {
-            String decoded = (String) ((PTuple) asciiDecodeNode.call(frame, encoding, PNone.NO_VALUE)).getSequenceStorage().getInternalArray()[0];
+            String decoded = (String) ((PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE)).getSequenceStorage().getInternalArray()[0];
             return lookup(frame, decoded, callNode, lenNode, hasSearchPathProfile, hasTruffleEncodingProfile, isTupleProfile);
         }
 
@@ -884,7 +887,7 @@ private static Object[] getSearchPaths(PythonContext ctx) {
     }
 
     private static boolean isTupleInstanceCheck(VirtualFrame frame, Object result, int len, TupleBuiltins.LenNode lenNode) throws PException {
-        return (result instanceof PTuple) && ((int) lenNode.call(frame, result) == len);
+        return (result instanceof PTuple) && ((int) lenNode.execute(frame, result) == len);
     }
 
     @TruffleBoundary
@@ -936,7 +939,7 @@ abstract static class ForgetCodecNode extends PythonBuiltinNode {
         @Specialization
         Object forget(VirtualFrame frame, PBytesLike encoding,
                         @Cached AsciiDecodeNode asciiDecodeNode) {
-            forget((String) ((PTuple) asciiDecodeNode.call(frame, encoding, PNone.NO_VALUE)).getSequenceStorage().getInternalArray()[0]);
+            forget((String) ((PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE)).getSequenceStorage().getInternalArray()[0]);
             return PNone.NONE;
         }
 
@@ -1061,7 +1064,7 @@ Object decode(VirtualFrame frame, Object obj, String encoding, String errors,
     }
 
     private static Object codec_getItem(VirtualFrame frame, String encoding, int index, LookupNode lookupNode, SequenceStorageNodes.GetItemNode getItemNode) {
-        PTuple t = (PTuple) lookupNode.call(frame, encoding);
+        PTuple t = (PTuple) lookupNode.execute(frame, encoding);
         return getItemNode.execute(frame, t.getSequenceStorage(), index);
     }
 
@@ -1079,7 +1082,7 @@ abstract static class UTF8EncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-8", errors);
+            return encode.execute(frame, obj, "utf-8", errors);
         }
     }
 
@@ -1089,7 +1092,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);
         }
     }
 
@@ -1099,7 +1102,7 @@ abstract static class UTF7EncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-7", errors);
+            return encode.execute(frame, obj, "utf-7", errors);
         }
     }
 
@@ -1109,7 +1112,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);
         }
     }
 
@@ -1119,7 +1122,7 @@ abstract static class UTF16EncodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, @SuppressWarnings("unused") Object byteorder,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-16", errors);
+            return encode.execute(frame, obj, "utf-16", errors);
         }
     }
 
@@ -1129,7 +1132,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);
         }
     }
 
@@ -1139,7 +1142,7 @@ abstract static class UTF16LEEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-16-le", errors);
+            return encode.execute(frame, obj, "utf-16-le", errors);
         }
     }
 
@@ -1149,7 +1152,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);
         }
     }
 
@@ -1159,7 +1162,7 @@ abstract static class UTF16BEEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-16-be", errors);
+            return encode.execute(frame, obj, "utf-16-be", errors);
         }
     }
 
@@ -1169,7 +1172,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);
         }
     }
 
@@ -1189,7 +1192,7 @@ abstract static class UTF32EncodeNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors, @SuppressWarnings("unused") Object byteorder,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-32", errors);
+            return encode.execute(frame, obj, "utf-32", errors);
         }
     }
 
@@ -1199,7 +1202,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);
         }
     }
 
@@ -1209,7 +1212,7 @@ abstract static class UTF32LEEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-32-le", errors);
+            return encode.execute(frame, obj, "utf-32-le", errors);
         }
     }
 
@@ -1219,7 +1222,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);
         }
     }
 
@@ -1229,7 +1232,7 @@ abstract static class UTF32BEEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "utf-32-be", errors);
+            return encode.execute(frame, obj, "utf-32-be", errors);
         }
     }
 
@@ -1239,7 +1242,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);
         }
     }
 
@@ -1279,7 +1282,7 @@ abstract static class RawUnicodeEscapeEncodeNode extends PythonBinaryBuiltinNode
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "raw_unicode_escape", errors);
+            return encode.execute(frame, obj, "raw_unicode_escape", errors);
         }
     }
 
@@ -1289,7 +1292,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);
         }
     }
 
@@ -1299,7 +1302,7 @@ abstract static class UnicodeEscapeEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "unicode_escape", errors);
+            return encode.execute(frame, obj, "unicode_escape", errors);
         }
     }
 
@@ -1309,7 +1312,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);
         }
     }
 
@@ -1319,7 +1322,7 @@ abstract static class Latin1EscapeEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "latin_1", errors);
+            return encode.execute(frame, obj, "latin_1", errors);
         }
     }
 
@@ -1329,7 +1332,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);
         }
     }
 
@@ -1339,7 +1342,7 @@ abstract static class AsciiEscapeEncodeNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object encode(VirtualFrame frame, Object obj, Object errors,
                         @Cached CodecsEncodeNode encode) {
-            return encode.call(frame, obj, "ascii", errors);
+            return encode.execute(frame, obj, "ascii", errors);
         }
     }
 
@@ -1349,7 +1352,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);
         }
     }