Feb 15, 2024 · Jan 26, 2024 · Jan 26, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
                                        PyObject *kwargs);


 .. c:type::_PyCFunctionFast
 .. c:type::PyCFunctionFast

   Type of the functions used to implement Python callables in C
   with signature :c:macro:`METH_FASTCALL`.
   The function signature is::

      PyObject *_PyCFunctionFast(PyObject *self,
      PyObject *PyCFunctionFast(PyObject *self,
                                 PyObject *const *args,
                                 Py_ssize_t nargs);

 .. c:type::_PyCFunctionFastWithKeywords
 .. c:type::PyCFunctionFastWithKeywords

   Type of the functions used to implement Python callables in C
   with signature :ref:`METH_FASTCALL | METH_KEYWORDS <METH_FASTCALL-METH_KEYWORDS>`.
   The function signature is::

      PyObject *_PyCFunctionFastWithKeywords(PyObject *self,
      PyObject *PyCFunctionFastWithKeywords(PyObject *self,
                                             PyObject *const *args,
                                             Py_ssize_t nargs,
                                             PyObject *kwnames);
 .. c:macro:: METH_FASTCALL

   Fast calling convention supporting only positional arguments.
   The methods have the type :c:type:`_PyCFunctionFast`.
   The methods have the type :c:type:`PyCFunctionFast`.
   The first parameter is *self*, the second parameter is a C array
   of :c:expr:`PyObject*` values indicating the arguments and the third
   parameter is the number of arguments (the length of the array).

 :c:expr:`METH_FASTCALL | METH_KEYWORDS`
   Extension of :c:macro:`METH_FASTCALL` supporting also keyword arguments,
   with methods of type :c:type:`_PyCFunctionFastWithKeywords`.
   with methods of type :c:type:`PyCFunctionFastWithKeywords`.
   Keyword arguments are passed the same way as in the
   :ref:`vectorcall protocol <vectorcall>`:
   there is an additional fourth :c:expr:`PyObject*` parameter
diff --git a/Include/methodobject.h b/Include/methodobject.h
 #define PyCFunction_Check(op) PyObject_TypeCheck((op), &PyCFunction_Type)

 typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
 typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t);
 typedef PyObject *(*PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t);
 typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
                                             PyObject *);
 typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *,
 typedef PyObject *(*PyCFunctionFastWithKeywords) (PyObject *,
                                                   PyObject *const *, Py_ssize_t,
                                                   PyObject *);
 typedef PyObject *(*PyCMethod)(PyObject *, PyTypeObject *, PyObject *const *,
                               size_t, PyObject *);

 // For backwards compatibility. `METH_FASTCALL` was added to the stable API in
 // 3.10 alongside `_PyCFunctionFastWithKeywords` and `_PyCFunctionFast`.
 typedef PyCFunctionFast _PyCFunctionFast;
 typedef PyCFunctionWithKeywords _PyCFunctionWithKeywords;

 // Cast an function to the PyCFunction type to use it with PyMethodDef.
 //
 // This macro can be used to prevent compiler warnings if the first parameter
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
    if (method_check_args(func, args, nargs, kwnames)) {
        return NULL;
    }
 _PyCFunctionFast meth = (_PyCFunctionFast)
 PyCFunctionFast meth = (PyCFunctionFast)
                            method_enter_call(tstate, func);
    if (meth == NULL) {
        return NULL;
    if (method_check_args(func, args, nargs, NULL)) {
        return NULL;
    }
 _PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
 PyCFunctionFastWithKeywords meth = (PyCFunctionFastWithKeywords)
                                        method_enter_call(tstate, func);
    if (meth == NULL) {
        return NULL;
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
        return NULL;
    }
    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
 _PyCFunctionFast meth = (_PyCFunctionFast)
 PyCFunctionFast meth = (PyCFunctionFast)
                            cfunction_enter_call(tstate, func);
    if (meth == NULL) {
        return NULL;
 {
    PyThreadState *tstate = _PyThreadState_GET();
    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
 _PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
 PyCFunctionFastWithKeywords meth = (PyCFunctionFastWithKeywords)
                                        cfunction_enter_call(tstate, func);
    if (meth == NULL) {
        return NULL;
    }
    return _Py_CheckFunctionResult(tstate, func, result, NULL);
 }

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
            STAT_INC(CALL, hit);
            PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
            /* res = func(self, args, nargs) */
            res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
            res = ((PyCFunctionFast)(void(*)(void))cfunc)(
                PyCFunction_GET_SELF(callable),
                args,
                total_args);
            DEOPT_IF(PyCFunction_GET_FLAGS(callable) != (METH_FASTCALL | METH_KEYWORDS));
            STAT_INC(CALL, hit);
            /* res = func(self, args, nargs, kwnames) */
 _PyCFunctionFastWithKeywords cfunc =
                (_PyCFunctionFastWithKeywords)(void(*)(void))
 PyCFunctionFastWithKeywords cfunc =
                (PyCFunctionFastWithKeywords)(void(*)(void))
                PyCFunction_GET_FUNCTION(callable);
            res = cfunc(PyCFunction_GET_SELF(callable), args, total_args, NULL);
            assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
            DEOPT_IF(!Py_IS_TYPE(self, d_type));
            STAT_INC(CALL, hit);
            int nargs = total_args - 1;
 _PyCFunctionFastWithKeywords cfunc =
                (_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
 PyCFunctionFastWithKeywords cfunc =
                (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
            res = cfunc(self, args + 1, nargs, NULL);
            assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));

            PyObject *self = args[0];
            DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type));
            STAT_INC(CALL, hit);
 _PyCFunctionFast cfunc =
                (_PyCFunctionFast)(void(*)(void))meth->ml_meth;
 PyCFunctionFast cfunc =
                (PyCFunctionFast)(void(*)(void))meth->ml_meth;
            int nargs = total_args - 1;
            res = cfunc(self, args + 1, nargs);
            assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -187,23 +187,23 @@ Implementing functions and methods
		PyObject *kwargs);


		.. c:type::_PyCFunctionFast
		.. c:type::PyCFunctionFast

		Type of the functions used to implement Python callables in C
		with signature :c:macro:`METH_FASTCALL`.
		The function signature is::

		PyObject _PyCFunctionFast(PyObject self,
		PyObject PyCFunctionFast(PyObject self,
erlend-aasland marked this conversation as resolved. Show resolvedHide resolved
		PyObject const args,
		Py_ssize_t nargs);

		.. c:type::_PyCFunctionFastWithKeywords
		.. c:type::PyCFunctionFastWithKeywords

		Type of the functions used to implement Python callables in C
		with signature :ref:`METH_FASTCALL \| METH_KEYWORDS <METH_FASTCALL-METH_KEYWORDS>`.
		The function signature is::

		PyObject _PyCFunctionFastWithKeywords(PyObject self,
		PyObject PyCFunctionFastWithKeywords(PyObject self,
		PyObject const args,
		Py_ssize_t nargs,
		PyObject *kwnames);
Expand DownExpand Up		@@ -290,7 +290,7 @@ There are these calling conventions:
		.. c:macro:: METH_FASTCALL

		Fast calling convention supporting only positional arguments.
		The methods have the type :c:type:`_PyCFunctionFast`.
		The methods have the type :c:type:`PyCFunctionFast`.
		The first parameter is self, the second parameter is a C array
		of :c:expr:`PyObject*` values indicating the arguments and the third
		parameter is the number of arguments (the length of the array).
Expand All		@@ -306,7 +306,7 @@ There are these calling conventions:

		:c:expr:`METH_FASTCALL \| METH_KEYWORDS`
		Extension of :c:macro:`METH_FASTCALL` supporting also keyword arguments,
		with methods of type :c:type:`_PyCFunctionFastWithKeywords`.
		with methods of type :c:type:`PyCFunctionFastWithKeywords`.
		Keyword arguments are passed the same way as in the
		:ref:`vectorcall protocol <vectorcall>`:
		there is an additional fourth :c:expr:`PyObject*` parameter
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,15 +17,20 @@ PyAPI_DATA(PyTypeObject) PyCFunction_Type;
		#define PyCFunction_Check(op) PyObject_TypeCheck((op), &PyCFunction_Type)

		typedef PyObject (PyCFunction)(PyObject , PyObject );
		typedef PyObject (_PyCFunctionFast) (PyObject , PyObject const *, Py_ssize_t);
		typedef PyObject (PyCFunctionFast) (PyObject , PyObject const *, Py_ssize_t);
		typedef PyObject (PyCFunctionWithKeywords)(PyObject , PyObject ,
		PyObject *);
		typedef PyObject (_PyCFunctionFastWithKeywords) (PyObject *,
		typedef PyObject (PyCFunctionFastWithKeywords) (PyObject *,
		PyObject const , Py_ssize_t,
		PyObject *);
		typedef PyObject (PyCMethod)(PyObject , PyTypeObject , PyObject const ,
		size_t, PyObject *);

		// For backwards compatibility. `METH_FASTCALL` was added to the stable API in
		// 3.10 alongside `_PyCFunctionFastWithKeywords` and `_PyCFunctionFast`.
encukou marked this conversation as resolved. Show resolvedHide resolved
		typedef PyCFunctionFast _PyCFunctionFast;
		typedef PyCFunctionWithKeywords _PyCFunctionWithKeywords;

		// Cast an function to the PyCFunction type to use it with PyMethodDef.
		//
		// This macro can be used to prevent compiler warnings if the first parameter
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -393,7 +393,7 @@ method_vectorcall_FASTCALL(
		if (method_check_args(func, args, nargs, kwnames)) {
		return NULL;
		}
		_PyCFunctionFast meth = (_PyCFunctionFast)
		PyCFunctionFast meth = (PyCFunctionFast)
		method_enter_call(tstate, func);
		if (meth == NULL) {
		return NULL;
Expand All		@@ -412,7 +412,7 @@ method_vectorcall_FASTCALL_KEYWORDS(
		if (method_check_args(func, args, nargs, NULL)) {
		return NULL;
		}
		_PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
		PyCFunctionFastWithKeywords meth = (PyCFunctionFastWithKeywords)
		method_enter_call(tstate, func);
		if (meth == NULL) {
		return NULL;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -417,7 +417,7 @@ cfunction_vectorcall_FASTCALL(
		return NULL;
		}
		Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
		_PyCFunctionFast meth = (_PyCFunctionFast)
		PyCFunctionFast meth = (PyCFunctionFast)
		cfunction_enter_call(tstate, func);
		if (meth == NULL) {
		return NULL;
Expand All		@@ -433,7 +433,7 @@ cfunction_vectorcall_FASTCALL_KEYWORDS(
		{
		PyThreadState *tstate = _PyThreadState_GET();
		Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
		_PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
		PyCFunctionFastWithKeywords meth = (PyCFunctionFastWithKeywords)
		cfunction_enter_call(tstate, func);
		if (meth == NULL) {
		return NULL;
Expand DownExpand Up		@@ -552,4 +552,3 @@ cfunction_call(PyObject func, PyObject args, PyObject *kwargs)
		}
		return _Py_CheckFunctionResult(tstate, func, result, NULL);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3382,7 +3382,7 @@ dummy_func(
		STAT_INC(CALL, hit);
		PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
		/* res = func(self, args, nargs) */
		res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
		res = ((PyCFunctionFast)(void(*)(void))cfunc)(
		PyCFunction_GET_SELF(callable),
		args,
		total_args);
Expand DownExpand Up		@@ -3413,8 +3413,8 @@ dummy_func(
		DEOPT_IF(PyCFunction_GET_FLAGS(callable) != (METH_FASTCALL \| METH_KEYWORDS));
		STAT_INC(CALL, hit);
		/* res = func(self, args, nargs, kwnames) */
		_PyCFunctionFastWithKeywords cfunc =
		(_PyCFunctionFastWithKeywords)(void(*)(void))
		PyCFunctionFastWithKeywords cfunc =
		(PyCFunctionFastWithKeywords)(void(*)(void))
		PyCFunction_GET_FUNCTION(callable);
		res = cfunc(PyCFunction_GET_SELF(callable), args, total_args, NULL);
		assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
Expand DownExpand Up		@@ -3545,8 +3545,8 @@ dummy_func(
		DEOPT_IF(!Py_IS_TYPE(self, d_type));
		STAT_INC(CALL, hit);
		int nargs = total_args - 1;
		_PyCFunctionFastWithKeywords cfunc =
		(_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
		PyCFunctionFastWithKeywords cfunc =
		(PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
		res = cfunc(self, args + 1, nargs, NULL);
		assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));

Expand DownExpand Up		@@ -3603,8 +3603,8 @@ dummy_func(
		PyObject *self = args[0];
		DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type));
		STAT_INC(CALL, hit);
		_PyCFunctionFast cfunc =
		(_PyCFunctionFast)(void(*)(void))meth->ml_meth;
		PyCFunctionFast cfunc =
		(PyCFunctionFast)(void(*)(void))meth->ml_meth;
		int nargs = total_args - 1;
		res = cfunc(self, args + 1, nargs);
		assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
Expand Down