mirror of
https://github.com/python/cpython.git
synced 2025-08-24 02:35:59 +00:00
81c72044a1
We're no longer using _Py_IDENTIFIER() (or _Py_static_string()) in any core CPython code. It is still used in a number of non-builtin stdlib modules. The replacement is: PyUnicodeObject (not pointer) fields under _PyRuntimeState, statically initialized as part of _PyRuntime. A new _Py_GET_GLOBAL_IDENTIFIER() macro facilitates lookup of the fields (along with _Py_GET_GLOBAL_STRING() for non-identifier strings). https://bugs.python.org/issue46541#msg411799 explains the rationale for this change. The core of the change is in: * (new) Include/internal/pycore_global_strings.h - the declarations for the global strings, along with the macros * Include/internal/pycore_runtime_init.h - added the static initializers for the global strings * Include/internal/pycore_global_objects.h - where the struct in pycore_global_strings.h is hooked into _PyRuntimeState * Tools/scripts/generate_global_objects.py - added generation of the global string declarations and static initializers I've also added a --check flag to generate_global_objects.py (along with make check-global-objects) to check for unused global strings. That check is added to the PR CI config. The remainder of this change updates the core code to use _Py_GET_GLOBAL_IDENTIFIER() instead of _Py_IDENTIFIER() and the related _Py*Id functions (likewise for _Py_GET_GLOBAL_STRING() instead of _Py_static_string()). This includes adding a few functions where there wasn't already an alternative to _Py*Id(), replacing the _Py_Identifier * parameter with PyObject *. The following are not changed (yet): * stop using _Py_IDENTIFIER() in the stdlib modules * (maybe) get rid of _Py_IDENTIFIER(), etc. entirely -- this may not be doable as at least one package on PyPI using this (private) API * (maybe) intern the strings during runtime init https://bugs.python.org/issue46541
121 lines
3.4 KiB
C
121 lines
3.4 KiB
C
#ifndef Py_INTERNAL_CALL_H
|
|
#define Py_INTERNAL_CALL_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef Py_BUILD_CORE
|
|
# error "this header requires Py_BUILD_CORE define"
|
|
#endif
|
|
|
|
#include "pycore_pystate.h" // _PyThreadState_GET()
|
|
|
|
PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
|
|
PyThreadState *tstate,
|
|
PyObject *callable,
|
|
PyObject *obj,
|
|
PyObject *args,
|
|
PyObject *kwargs);
|
|
|
|
PyAPI_FUNC(PyObject *) _PyObject_FastCallDictTstate(
|
|
PyThreadState *tstate,
|
|
PyObject *callable,
|
|
PyObject *const *args,
|
|
size_t nargsf,
|
|
PyObject *kwargs);
|
|
|
|
PyAPI_FUNC(PyObject *) _PyObject_Call(
|
|
PyThreadState *tstate,
|
|
PyObject *callable,
|
|
PyObject *args,
|
|
PyObject *kwargs);
|
|
|
|
extern PyObject * _PyObject_CallMethodFormat(
|
|
PyThreadState *tstate, PyObject *callable, const char *format, ...);
|
|
|
|
|
|
// Static inline variant of public PyVectorcall_Function().
|
|
static inline vectorcallfunc
|
|
_PyVectorcall_FunctionInline(PyObject *callable)
|
|
{
|
|
assert(callable != NULL);
|
|
|
|
PyTypeObject *tp = Py_TYPE(callable);
|
|
if (!PyType_HasFeature(tp, Py_TPFLAGS_HAVE_VECTORCALL)) {
|
|
return NULL;
|
|
}
|
|
assert(PyCallable_Check(callable));
|
|
|
|
Py_ssize_t offset = tp->tp_vectorcall_offset;
|
|
assert(offset > 0);
|
|
|
|
vectorcallfunc ptr;
|
|
memcpy(&ptr, (char *) callable + offset, sizeof(ptr));
|
|
return ptr;
|
|
}
|
|
|
|
|
|
/* Call the callable object 'callable' with the "vectorcall" calling
|
|
convention.
|
|
|
|
args is a C array for positional arguments.
|
|
|
|
nargsf is the number of positional arguments plus optionally the flag
|
|
PY_VECTORCALL_ARGUMENTS_OFFSET which means that the caller is allowed to
|
|
modify args[-1].
|
|
|
|
kwnames is a tuple of keyword names. The values of the keyword arguments
|
|
are stored in "args" after the positional arguments (note that the number
|
|
of keyword arguments does not change nargsf). kwnames can also be NULL if
|
|
there are no keyword arguments.
|
|
|
|
keywords must only contain strings and all keys must be unique.
|
|
|
|
Return the result on success. Raise an exception and return NULL on
|
|
error. */
|
|
static inline PyObject *
|
|
_PyObject_VectorcallTstate(PyThreadState *tstate, PyObject *callable,
|
|
PyObject *const *args, size_t nargsf,
|
|
PyObject *kwnames)
|
|
{
|
|
vectorcallfunc func;
|
|
PyObject *res;
|
|
|
|
assert(kwnames == NULL || PyTuple_Check(kwnames));
|
|
assert(args != NULL || PyVectorcall_NARGS(nargsf) == 0);
|
|
|
|
func = _PyVectorcall_FunctionInline(callable);
|
|
if (func == NULL) {
|
|
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
|
|
return _PyObject_MakeTpCall(tstate, callable, args, nargs, kwnames);
|
|
}
|
|
res = func(callable, args, nargsf, kwnames);
|
|
return _Py_CheckFunctionResult(tstate, callable, res, NULL);
|
|
}
|
|
|
|
|
|
static inline PyObject *
|
|
_PyObject_CallNoArgsTstate(PyThreadState *tstate, PyObject *func) {
|
|
return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
|
|
}
|
|
|
|
|
|
// Private static inline function variant of public PyObject_CallNoArgs()
|
|
static inline PyObject *
|
|
_PyObject_CallNoArgs(PyObject *func) {
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
|
|
}
|
|
|
|
|
|
static inline PyObject *
|
|
_PyObject_FastCallTstate(PyThreadState *tstate, PyObject *func, PyObject *const *args, Py_ssize_t nargs)
|
|
{
|
|
return _PyObject_VectorcallTstate(tstate, func, args, (size_t)nargs, NULL);
|
|
}
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_INTERNAL_CALL_H */
|