Sep 15, 2022 · May 3, 2022 · May 3, 2022 · May 3, 2022 · May 3, 2022 · May 3, 2022
diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h
 PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *);
 PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *);
 PyAPI_FUNC(int) PyFunction_SetVectorcall(PyFunctionObject *, vectorcallfunc);
 PyAPI_FUNC(PyObject *) PyFunction_GetKwDefaults(PyObject *);
 PyAPI_FUNC(int) PyFunction_SetKwDefaults(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *);
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
                self.assertEqual(expected, meth(*args1, **kwargs))
                self.assertEqual(expected, wrapped(*args, **kwargs))

    def test_setvectorcall(self):
        from _testcapi import pyobject_setvectorcall
        def f(num): return num + 1
        arg = (10,)

        assert f(*arg) is 11
        pyobject_setvectorcall(f)
        assert f(*arg) is None

 class A:
    def method_two_args(self, x, y):
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
 }


 static PyObject *
 override_vectorcall(
    PyObject *callable, PyObject *const *args, size_t nargsf, PyObject *kwnames) {
    Py_RETURN_NONE;
 }

 static PyObject *
 test_pyobject_setvectorcall(PyObject *self, PyObject *args)
 {
    PyFunctionObject *func = NULL;
    if (!PyArg_ParseTuple(args, "O", &func)) {
        return NULL;
    }
    if(PyFunction_SetVectorcall(func, (vectorcallfunc)override_vectorcall) != 0) {
        PyErr_SetString(PyExc_TypeError, "Something went wrong setting vectorcall field");
        return NULL;
    }
    Py_RETURN_NONE;
 }

 static PyObject *
 test_pyvectorcall_call(PyObject *self, PyObject *args)
 {
    {"pyobject_fastcall", test_pyobject_fastcall, METH_VARARGS},
    {"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
    {"pyobject_vectorcall", test_pyobject_vectorcall, METH_VARARGS},
    {"pyobject_setvectorcall", test_pyobject_setvectorcall, METH_VARARGS},
    {"pyvectorcall_call", test_pyvectorcall_call, METH_VARARGS},
    {"stack_pointer", stack_pointer, METH_NOARGS},
 #ifdef W_STOPCODE
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
    if (func->func_version != 0) {
        return func->func_version;
    }
    if (func->vectorcall != _PyFunction_Vectorcall) {
        return 0;
    }
    if (next_func_version == 0) {
        return 0;
    }
    return 0;
 }

 int
 PyFunction_SetVectorcall(PyFunctionObject *func, vectorcallfunc vectorcall)
 {
    func->func_version = 0;
    func->vectorcall = vectorcall;
    return 0;
 }

 PyObject *
 PyFunction_GetKwDefaults(PyObject *op)
 {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,6 +69,7 @@ PyAPI_FUNC(PyObject ) PyFunction_GetGlobals(PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetModule(PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetDefaults(PyObject );
		PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject , PyObject );
		PyAPI_FUNC(int) PyFunction_SetVectorcall(PyFunctionObject *, vectorcallfunc);
		PyAPI_FUNC(PyObject ) PyFunction_GetKwDefaults(PyObject );
		PyAPI_FUNC(int) PyFunction_SetKwDefaults(PyObject , PyObject );
		PyAPI_FUNC(PyObject ) PyFunction_GetClosure(PyObject );
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -665,6 +665,14 @@ def __call__(self, *args):
		self.assertEqual(expected, meth(args1, *kwargs))
		self.assertEqual(expected, wrapped(args, *kwargs))

		def test_setvectorcall(self):
		from _testcapi import pyobject_setvectorcall
		def f(num): return num + 1
		arg = (10,)

		assert f(*arg) is 11
		pyobject_setvectorcall(f)
		assert f(*arg) is None

		class A:
		def method_two_args(self, x, y):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5285,6 +5285,26 @@ test_pyobject_vectorcall(PyObject self, PyObject args)
		}


		static PyObject *
		override_vectorcall(
		PyObject callable, PyObject const args, size_t nargsf, PyObject kwnames) {
		Py_RETURN_NONE;
Copy link Member vstinnerJun 16, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Could you modify the test to return the string "overridden" instead of just returning None?
		}

		static PyObject *
		test_pyobject_setvectorcall(PyObject self, PyObject args)
		{
		PyFunctionObject *func = NULL;
		if (!PyArg_ParseTuple(args, "O", &func)) {
adphrost marked this conversation as resolved. OutdatedShow resolvedHide resolved
		return NULL;
		}
		if(PyFunction_SetVectorcall(func, (vectorcallfunc)override_vectorcall) != 0) {
		PyErr_SetString(PyExc_TypeError, "Something went wrong setting vectorcall field");
		return NULL;
		}
		Py_RETURN_NONE;
		}

		static PyObject *
		test_pyvectorcall_call(PyObject self, PyObject args)
		{
Expand DownExpand Up		@@ -6186,6 +6206,7 @@ static PyMethodDef TestMethods[] = {
		{"pyobject_fastcall", test_pyobject_fastcall, METH_VARARGS},
		{"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
		{"pyobject_vectorcall", test_pyobject_vectorcall, METH_VARARGS},
		{"pyobject_setvectorcall", test_pyobject_setvectorcall, METH_VARARGS},
adphrost marked this conversation as resolved. OutdatedShow resolvedHide resolved
		{"pyvectorcall_call", test_pyvectorcall_call, METH_VARARGS},
		{"stack_pointer", stack_pointer, METH_NOARGS},
		#ifdef W_STOPCODE
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,6 +133,9 @@ uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func)
		if (func->func_version != 0) {
		return func->func_version;
		}
		if (func->vectorcall != _PyFunction_Vectorcall) {
		return 0;
markshannon marked this conversation as resolved. Show resolvedHide resolved
		}
		if (next_func_version == 0) {
		return 0;
		}
Expand DownExpand Up		@@ -208,6 +211,14 @@ PyFunction_SetDefaults(PyObject op, PyObject defaults)
		return 0;
		}

		int
adphrost marked this conversation as resolved. OutdatedShow resolvedHide resolved
		PyFunction_SetVectorcall(PyFunctionObject *func, vectorcallfunc vectorcall)
		{
		func->func_version = 0;
erlend-aasland marked this conversation as resolved. Show resolvedHide resolved
		func->vectorcall = vectorcall;
		return 0;
		}

		PyObject *
		PyFunction_GetKwDefaults(PyObject *op)
		{
Expand Down