Added assert on inappropriate use of specific-arg-count builtin nodes, varArgsMarker does not imply takesVarArgs

Author: otethal

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

@@ -65,7 +65,7 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
-import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.statement.RaiseNode;
@@ -241,7 +241,7 @@ private void raiseObject(Object exceptionObject, String message) {
     @Builtin(name = "b2a_base64", minNumOfPositionalArgs = 1, numOfPositionalOnlyArgs = 1, parameterNames = {"data"}, keywordOnlyNames = {"newline"})
     @ArgumentClinic(name = "newline", conversion = ArgumentClinic.ClinicConversion.Int, defaultValue = "1", useDefaultForNone = true)
     @GenerateNodeFactory
-    abstract static class B2aBase64Node extends PythonBinaryClinicBuiltinNode {
+    abstract static class B2aBase64Node extends PythonClinicBuiltinNode {
         @TruffleBoundary
         private static byte[] b2a(byte[] data, int newline) {
             String encode = Base64.encode(data);

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

@@ -16,8 +16,8 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
-import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CoerceToComplexNode;
@@ -993,11 +993,11 @@ static TanhNode create() {
         }
     }
 
-    @Builtin(name = "isclose", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 2, keywordOnlyNames = {"rel_tol", "abs_tol"})
+    @Builtin(name = "isclose", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 2, varArgsMarker = true, keywordOnlyNames = {"rel_tol", "abs_tol"})
     @TypeSystemReference(PythonArithmeticTypes.class)
     @ImportStatic(MathGuards.class)
     @GenerateNodeFactory
-    abstract static class IsCloseNode extends PythonQuaternaryBuiltinNode {
+    abstract static class IsCloseNode extends PythonBuiltinNode {
 
         private static final double DEFAULT_REL_TOL = 1e-09;
         private static final double DEFAULT_ABS_TOL = 0;

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

@@ -1868,7 +1868,7 @@ protected static GetTerminalSizeNode create() {
     @Builtin(name = "readlink", minNumOfPositionalArgs = 1, parameterNames = {"path"}, varArgsMarker = true, keywordOnlyNames = {"dirFd"}, doc = "readlink(path, *, dir_fd=None) -> path\n" +
                     "\nReturn a string representing the path to which the symbolic link points.\n")
     @GenerateNodeFactory
-    abstract static class ReadlinkNode extends PythonBinaryBuiltinNode {
+    abstract static class ReadlinkNode extends PythonBuiltinNode {
         @Specialization(limit = "1")
         String readlink(VirtualFrame frame, Object str, @SuppressWarnings("unused") PNone none,
                         @CachedLibrary("str") PythonObjectLibrary lib) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/posix/DirEntryBuiltins.java

@@ -54,6 +54,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -118,7 +119,7 @@ boolean test(PDirEntry self) {
 
     @Builtin(name = "is_dir", minNumOfPositionalArgs = 1, keywordOnlyNames = {"follow_symlinks"}, needsFrame = true)
     @GenerateNodeFactory
-    abstract static class IsDirNode extends PythonBinaryBuiltinNode {
+    abstract static class IsDirNode extends PythonBuiltinNode {
         @Specialization
         boolean testBool(PDirEntry self, boolean followSymlinks) {
             return self.getFile().isDirectory(getLinkOption(followSymlinks));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java

@@ -179,11 +179,23 @@ private static Signature createSignature(NodeFactory<? extends PythonBuiltinBase
                 }
             }
         }
-
-        return new Signature(builtin.numOfPositionalOnlyArgs(), builtin.takesVarKeywordArgs(), (builtin.takesVarArgs() || builtin.varArgsMarker()) ? parameterNames.length : -1,
+        assert canUseSpecialBuiltinNode(builtin) || !usesSpecialBuiltinNode(factory.getNodeClass()) : factory.getNodeClass().getName() +
+                        " must not use PythonUnary/Binary/Ternary/QuaternaryBultinNode";
+        return new Signature(builtin.numOfPositionalOnlyArgs(), builtin.takesVarKeywordArgs(), builtin.takesVarArgs() ? parameterNames.length : -1,
                         builtin.varArgsMarker(), parameterNames, builtin.keywordOnlyNames());
     }
 
+    // Nodes optimized for specific arg count (eg. PythonUnaryBultinNode, PythonBinaryBultinNode)
+    // can only be used by functions with fixed number of positional arguments.
+    private static boolean canUseSpecialBuiltinNode(Builtin builtin) {
+        return !builtin.takesVarArgs() && !builtin.takesVarKeywordArgs() && !builtin.varArgsMarker() && builtin.keywordOnlyNames().length == 0;
+    }
+
+    private static boolean usesSpecialBuiltinNode(Class<? extends PythonBuiltinBaseNode> clazz) {
+        return PythonUnaryBuiltinNode.class.isAssignableFrom(clazz) || PythonBinaryBuiltinNode.class.isAssignableFrom(clazz) || PythonTernaryBuiltinNode.class.isAssignableFrom(clazz) ||
+                        PythonQuaternaryBuiltinNode.class.isAssignableFrom(clazz);
+    }
+
     /**
      * Must return argument reads compatible with
      * {@link #createSignature(NodeFactory, Builtin, boolean)}