Fix deprecations related to ArityException

steve-s · msimacek · commit 947fe2ee9730 · 2021-05-11T13:23:33.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java
@@ -336,7 +336,7 @@ boolean isMemberInvocable(String member) {
             @ExportMessage
             Object invokeMember(String member, Object... arguments) throws ArityException, UnknownIdentifierException {
                 if (arguments.length != 0) {
-                    throw ArityException.create(0, arguments.length);
+                    throw ArityException.create(0, 0, arguments.length);
                 } else if (!member.equals("getMyName")) {
                     throw UnknownIdentifierException.create(member);
                 } else {
@@ -392,7 +392,7 @@ boolean isExecutable() {
             @ExportMessage
             Object execute(Object... arguments) throws ArityException {
                 if (arguments.length != 0) {
-                    throw ArityException.create(0, arguments.length);
+                    throw ArityException.create(0, 0, arguments.length);
                 } else {
                     return self.getMyName();
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ExternalFunctionNodes.java
@@ -544,7 +544,7 @@ public Object execute(VirtualFrame frame, String name, Object callable, Object[]
                 throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_FAILED, name, e);
             } catch (ArityException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_EXPECTED_ARGS, name, e.getExpectedArity(), e.getActualArity());
+                throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_EXPECTED_ARGS, name, e.getExpectedMinArity(), e.getActualArity());
             } finally {
                 // special case after calling a C function: transfer caught exception back to frame
                 // to simulate the global state semantics
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -408,7 +408,7 @@ private Object initCApiModule(TruffleObject sulongLibrary, String initFuncName,
             } catch (ArityException e) {
                 // In case of multi-phase init, the init function may take more than one arguments.
                 // However, CPython gracefully ignores that. So, we pass just NULL pointers.
-                Object[] arguments = new Object[e.getExpectedArity()];
+                Object[] arguments = new Object[e.getExpectedMinArity()];
                 Arrays.fill(arguments, PNone.NO_VALUE);
                 nativeResult = interop.execute(pyinitFunc, arguments);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/HandleCache.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/HandleCache.java
@@ -97,7 +97,7 @@ public Object execute(Object[] arguments,
         try {
             if (arguments.length != 1) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return getOrInsertNode.execute(this, (long) arguments[0]);
         } finally {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java
@@ -136,7 +136,7 @@ public Object execute(Object[] arguments,
             try {
                 if (arguments.length != 3) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(3, arguments.length);
+                    throw ArityException.create(3, 3, arguments.length);
                 }
 
                 // convert args
@@ -179,7 +179,7 @@ public Object execute(Object[] arguments,
             try {
                 if (arguments.length != 1) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(1, arguments.length);
+                    throw ArityException.create(1, 1, arguments.length);
                 }
 
                 // convert args
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeReferenceCache.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeReferenceCache.java
@@ -100,7 +100,7 @@ Object execute(Object[] arguments,
                 return resolveNativeReferenceNode.execute(arguments[0], arguments[1], steal);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw ArityException.create(1, arguments.length);
+            throw ArityException.create(1, 1, arguments.length);
         } finally {
             gil.release(mustRelease);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java
@@ -144,7 +144,7 @@ protected Object execute(Object[] arguments,
             try {
                 if (arguments.length != 2) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(2, arguments.length);
+                    throw ArityException.create(2, 2, arguments.length);
                 }
                 try {
                     return incRefNode.inc(toSulongNode.execute(executeNode.executeObject(null, lib.getDelegate(this), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]))));
@@ -179,7 +179,7 @@ protected int execute(Object[] arguments,
             try {
                 if (arityProfile.profile(arguments.length != 3)) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(3, arguments.length);
+                    throw ArityException.create(3, 3, arguments.length);
                 }
                 try {
                     callTernaryMethodNode.execute(null, lib.getDelegate(this), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]), toJavaNode.execute(arguments[2]));
@@ -221,7 +221,7 @@ protected Object execute(Object[] arguments,
             try {
                 if (arguments.length != 2) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(2, arguments.length);
+                    throw ArityException.create(2, 2, arguments.length);
                 }
                 assert arguments[1] instanceof Number;
                 try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectAlloc.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectAlloc.java
@@ -84,7 +84,7 @@ Object execute(Object[] arguments,
         try {
             if (arguments.length != 2) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(2, arguments.length);
+                throw ArityException.create(2, 2, arguments.length);
             }
 
             Object allocatedObject = arguments[0];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectFree.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectFree.java
@@ -78,7 +78,7 @@ Object execute(Object[] arguments,
         try {
             if (arguments.length != 1) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return freeNode.execute(arguments[0]);
         } finally {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java
@@ -1179,7 +1179,7 @@ static void doExecuteConverterGeneric(ConversionNodeSupplier supplier, int index
                 raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_INCOMPATIBLE_PARAMS, e.getSuppliedValues());
             } catch (ArityException e) {
                 CompilerDirectives.transferToInterpreter();
-                raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_EXPECTED_D_GOT_P, e.getExpectedArity(),
+                raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_EXPECTED_D_GOT_P, e.getExpectedMinArity(),
                                 e.getActualArity());
             } catch (UnsupportedMessageException e) {
                 CompilerDirectives.transferToInterpreter();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -228,7 +228,7 @@ static void checkMode(FunctionMode actualMode, FunctionMode... allowedModes) {
         protected static void checkArity(Object[] arguments, int expectedArity) throws ArityException {
             if (arguments.length != expectedArity) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(expectedArity, arguments.length);
+                throw ArityException.create(expectedArity, expectedArity, arguments.length);
             }
         }
     }
@@ -605,11 +605,11 @@ protected void checkArguments(Object[] arguments) throws ArityException {
             // we also need to account for the HPy context
             if (inplaceOperator.isTernary() && arguments.length != 4) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(4, arguments.length);
+                throw ArityException.create(4, 4, arguments.length);
             }
             if (!inplaceOperator.isTernary() && arguments.length != 3) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(3, arguments.length);
+                throw ArityException.create(3, 3, arguments.length);
             }
         }
 
@@ -1155,7 +1155,7 @@ Object execute(Object[] arguments,
                         @Cached PythonObjectFactory factory) throws ArityException {
             int expectedArity = withSize ? 3 : 2;
             if (arguments.length != expectedArity) {
-                throw ArityException.create(expectedArity, arguments.length);
+                throw ArityException.create(expectedArity, expectedArity, arguments.length);
             }
             GraalHPyContext context = asContextNode.execute(arguments[0]);
             Object charPtr = arguments[1];
@@ -1691,7 +1691,7 @@ static Object doGeneric(GraalHPyCallBuiltinFunction receiver, Object[] arguments
                 try {
                     if (arguments.length != receiver.nPythonArguments + 1) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();
-                        throw ArityException.create(receiver.nPythonArguments + 1, arguments.length);
+                        throw ArityException.create(receiver.nPythonArguments + 1, receiver.nPythonArguments + 1, arguments.length);
                     }
                     GraalHPyContext nativeContext = asContextNode.execute(arguments[0]);
                     Object[] pythonArguments = new Object[receiver.nPythonArguments];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyInitObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyInitObject.java
@@ -101,7 +101,7 @@ Object invokeMember(String key, Object[] arguments,
         boolean mustRelease = gil.acquire();
         try {
             if (arguments.length != 1) {
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
 
             switch (key) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java
@@ -344,7 +344,7 @@ Object doIt(VirtualFrame frame, String name, Object callable, Object[] arguments
             } catch (UnsupportedTypeException | UnsupportedMessageException e) {
                 throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %m", name, e);
             } catch (ArityException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedArity(), e.getActualArity());
+                throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedMinArity(), e.getActualArity());
             } finally {
                 // special case after calling a C function: transfer caught exception back to frame
                 // to simulate the global state semantics
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -259,7 +259,7 @@ Object invokeMember(String name, Object[] arguments,
         boolean mustRelease = gil.acquire();
         try {
             if (arguments.length != 1) {
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return readMember(name, gil).catches(new Object[]{arguments[0]}, gil);
         } finally {
@@ -288,7 +288,7 @@ boolean catches(Object[] arguments,
             boolean mustRelease = gil.acquire();
             try {
                 if (arguments.length != 1) {
-                    throw ArityException.create(1, arguments.length);
+                    throw ArityException.create(1, 1, arguments.length);
                 }
                 Object exception = arguments[0];
                 if (exception instanceof PBaseException) {

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ private Object initCApiModule(TruffleObject sulongLibrary, String initFuncName,`
`408`	`408`	`} catch (ArityException e) {`
`409`	`409`	`// In case of multi-phase init, the init function may take more than one arguments.`
`410`	`410`	`// However, CPython gracefully ignores that. So, we pass just NULL pointers.`
`411`		`- Object[] arguments = new Object[e.getExpectedArity()];`
	`411`	`+ Object[] arguments = new Object[e.getExpectedMinArity()];`
`412`	`412`	`Arrays.fill(arguments, PNone.NO_VALUE);`
`413`	`413`	`nativeResult = interop.execute(pyinitFunc, arguments);`
`414`	`414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public Object execute(Object[] arguments,`
`97`	`97`	`try {`
`98`	`98`	`if (arguments.length != 1) {`
`99`	`99`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`100`		`- throw ArityException.create(1, arguments.length);`
	`100`	`+ throw ArityException.create(1, 1, arguments.length);`
`101`	`101`	`}`
`102`	`102`	`return getOrInsertNode.execute(this, (long) arguments[0]);`
`103`	`103`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ Object execute(Object[] arguments,`
`100`	`100`	`return resolveNativeReferenceNode.execute(arguments[0], arguments[1], steal);`
`101`	`101`	`}`
`102`	`102`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`103`		`- throw ArityException.create(1, arguments.length);`
	`103`	`+ throw ArityException.create(1, 1, arguments.length);`
`104`	`104`	`} finally {`
`105`	`105`	`gil.release(mustRelease);`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ Object execute(Object[] arguments,`
`84`	`84`	`try {`
`85`	`85`	`if (arguments.length != 2) {`
`86`	`86`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`87`		`- throw ArityException.create(2, arguments.length);`
	`87`	`+ throw ArityException.create(2, 2, arguments.length);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`Object allocatedObject = arguments[0];`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ Object execute(Object[] arguments,`
`78`	`78`	`try {`
`79`	`79`	`if (arguments.length != 1) {`
`80`	`80`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`81`		`- throw ArityException.create(1, arguments.length);`
	`81`	`+ throw ArityException.create(1, 1, arguments.length);`
`82`	`82`	`}`
`83`	`83`	`return freeNode.execute(arguments[0]);`
`84`	`84`	`} finally {`