Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-135755: Move PyFunction_GET_BUILTINS to the private API (GH-135938)

Browse source
This commit is contained in:
Peter Bierma 2025-06-26 05:43:08 -04:00 • committed by GitHub
parent a1da208eec
commit 10a3d43188
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Include/cpython/funcobject.h
View file

@ -97,11 +97,6 @@ static inline PyObject* PyFunction_GET_GLOBALS(PyObject *func) {
} }
#define PyFunction_GET_GLOBALS(func) PyFunction_GET_GLOBALS(_PyObject_CAST(func)) #define PyFunction_GET_GLOBALS(func) PyFunction_GET_GLOBALS(_PyObject_CAST(func))
static inline PyObject* PyFunction_GET_BUILTINS(PyObject *func) {
return _PyFunction_CAST(func)->func_builtins;
}
#define PyFunction_GET_BUILTINS(func) PyFunction_GET_BUILTINS(_PyObject_CAST(func))
static inline PyObject* PyFunction_GET_MODULE(PyObject *func) { static inline PyObject* PyFunction_GET_MODULE(PyObject *func) {
return _PyFunction_CAST(func)->func_module; return _PyFunction_CAST(func)->func_module;
} }

5
Include/internal/pycore_function.h
View file

@ -41,6 +41,11 @@ extern PyObject *_Py_set_function_type_params(
PyAPI_FUNC(int) PyAPI_FUNC(int)
_PyFunction_VerifyStateless(PyThreadState *, PyObject *); _PyFunction_VerifyStateless(PyThreadState *, PyObject *);
static inline PyObject* _PyFunction_GET_BUILTINS(PyObject *func) {
return _PyFunction_CAST(func)->func_builtins;
}
#define _PyFunction_GET_BUILTINS(func) _PyFunction_GET_BUILTINS(_PyObject_CAST(func))
#ifdef __cplusplus #ifdef __cplusplus
} }

5
Modules/_testinternalcapi.c
View file

@ -21,6 +21,7 @@
#include "pycore_fileutils.h" // _Py_normpath() #include "pycore_fileutils.h" // _Py_normpath()
#include "pycore_flowgraph.h" // _PyCompile_OptimizeCfg() #include "pycore_flowgraph.h" // _PyCompile_OptimizeCfg()
#include "pycore_frame.h" // _PyInterpreterFrame #include "pycore_frame.h" // _PyInterpreterFrame
#include "pycore_function.h" // _PyFunction_GET_BUILTINS
#include "pycore_gc.h" // PyGC_Head #include "pycore_gc.h" // PyGC_Head
#include "pycore_hashtable.h" // _Py_hashtable_new() #include "pycore_hashtable.h" // _Py_hashtable_new()
#include "pycore_import.h" // _PyImport_ClearExtension() #include "pycore_import.h" // _PyImport_ClearExtension()
@ -1022,7 +1023,7 @@ get_code_var_counts(PyObject *self, PyObject *_args, PyObject *_kwargs)
globalsns = PyFunction_GET_GLOBALS(codearg); globalsns = PyFunction_GET_GLOBALS(codearg);
} }
if (builtinsns == NULL) { if (builtinsns == NULL) {
builtinsns = PyFunction_GET_BUILTINS(codearg); builtinsns = _PyFunction_GET_BUILTINS(codearg);
} }
codearg = PyFunction_GET_CODE(codearg); codearg = PyFunction_GET_CODE(codearg);
} }
@ -1190,7 +1191,7 @@ verify_stateless_code(PyObject *self, PyObject *args, PyObject *kwargs)
globalsns = PyFunction_GET_GLOBALS(codearg); globalsns = PyFunction_GET_GLOBALS(codearg);
} }
if (builtinsns == NULL) { if (builtinsns == NULL) {
builtinsns = PyFunction_GET_BUILTINS(codearg); builtinsns = _PyFunction_GET_BUILTINS(codearg);
} }
codearg = PyFunction_GET_CODE(codearg); codearg = PyFunction_GET_CODE(codearg);
} }

2
Objects/funcobject.c
View file

@ -1256,7 +1256,7 @@ _PyFunction_VerifyStateless(PyThreadState *tstate, PyObject *func)
return -1; return -1;
} }
// Check the builtins. // Check the builtins.
PyObject *builtinsns = PyFunction_GET_BUILTINS(func); PyObject *builtinsns = _PyFunction_GET_BUILTINS(func);
if (builtinsns != NULL && !PyDict_Check(builtinsns)) { if (builtinsns != NULL && !PyDict_Check(builtinsns)) {
_PyErr_Format(tstate, PyExc_TypeError, _PyErr_Format(tstate, PyExc_TypeError,
"unsupported builtins %R", builtinsns); "unsupported builtins %R", builtinsns);