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

ZeroIntensity · web-flow · commit 10a3d431881b · 2025-06-26T11:43:08.000+02:00
diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h
@@ -97,11 +97,6 @@ static inline PyObject* PyFunction_GET_GLOBALS(PyObject *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) {
     return _PyFunction_CAST(func)->func_module;
 }
diff --git a/Include/internal/pycore_function.h b/Include/internal/pycore_function.h
@@ -41,6 +41,11 @@ extern PyObject *_Py_set_function_type_params(
 PyAPI_FUNC(int)
 _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
 }
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -21,6 +21,7 @@
 #include "pycore_fileutils.h"     // _Py_normpath()
 #include "pycore_flowgraph.h"     // _PyCompile_OptimizeCfg()
 #include "pycore_frame.h"         // _PyInterpreterFrame
+#include "pycore_function.h"      // _PyFunction_GET_BUILTINS
 #include "pycore_gc.h"            // PyGC_Head
 #include "pycore_hashtable.h"     // _Py_hashtable_new()
 #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);
         }
         if (builtinsns == NULL) {
-            builtinsns = PyFunction_GET_BUILTINS(codearg);
+            builtinsns = _PyFunction_GET_BUILTINS(codearg);
         }
         codearg = PyFunction_GET_CODE(codearg);
     }
@@ -1190,7 +1191,7 @@ verify_stateless_code(PyObject *self, PyObject *args, PyObject *kwargs)
             globalsns = PyFunction_GET_GLOBALS(codearg);
         }
         if (builtinsns == NULL) {
-            builtinsns = PyFunction_GET_BUILTINS(codearg);
+            builtinsns = _PyFunction_GET_BUILTINS(codearg);
         }
         codearg = PyFunction_GET_CODE(codearg);
     }
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -1256,7 +1256,7 @@ _PyFunction_VerifyStateless(PyThreadState *tstate, PyObject *func)
         return -1;
     }
     // Check the builtins.
-    PyObject *builtinsns = PyFunction_GET_BUILTINS(func);
+    PyObject *builtinsns = _PyFunction_GET_BUILTINS(func);
     if (builtinsns != NULL && !PyDict_Check(builtinsns)) {
         _PyErr_Format(tstate, PyExc_TypeError,
                       "unsupported builtins %R", builtinsns);

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,6 @@ static inline PyObject* PyFunction_GET_GLOBALS(PyObject *func) {`
`97`	`97`	`}`
`98`	`98`	`#define PyFunction_GET_GLOBALS(func) PyFunction_GET_GLOBALS(_PyObject_CAST(func))`
`99`	`99`
`100`		`-static inline PyObject* PyFunction_GET_BUILTINS(PyObject *func) {`
`101`		`- return _PyFunction_CAST(func)->func_builtins;`
`102`		`-}`
`103`		`-#define PyFunction_GET_BUILTINS(func) PyFunction_GET_BUILTINS(_PyObject_CAST(func))`
`104`		`-`
`105`	`100`	`static inline PyObject* PyFunction_GET_MODULE(PyObject *func) {`
`106`	`101`	`return _PyFunction_CAST(func)->func_module;`
`107`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include "pycore_fileutils.h" // _Py_normpath()`
`22`	`22`	`#include "pycore_flowgraph.h" // _PyCompile_OptimizeCfg()`
`23`	`23`	`#include "pycore_frame.h" // _PyInterpreterFrame`
	`24`	`+#include "pycore_function.h" // _PyFunction_GET_BUILTINS`
`24`	`25`	`#include "pycore_gc.h" // PyGC_Head`
`25`	`26`	`#include "pycore_hashtable.h" // _Py_hashtable_new()`
`26`	`27`	`#include "pycore_import.h" // _PyImport_ClearExtension()`
`@@ -1022,7 +1023,7 @@ get_code_var_counts(PyObject self, PyObject _args, PyObject *_kwargs)`
`1022`	`1023`	`globalsns = PyFunction_GET_GLOBALS(codearg);`
`1023`	`1024`	`}`
`1024`	`1025`	`if (builtinsns == NULL) {`
`1025`		`- builtinsns = PyFunction_GET_BUILTINS(codearg);`
	`1026`	`+ builtinsns = _PyFunction_GET_BUILTINS(codearg);`
`1026`	`1027`	`}`
`1027`	`1028`	`codearg = PyFunction_GET_CODE(codearg);`
`1028`	`1029`	`}`
`@@ -1190,7 +1191,7 @@ verify_stateless_code(PyObject self, PyObject args, PyObject *kwargs)`
`1190`	`1191`	`globalsns = PyFunction_GET_GLOBALS(codearg);`
`1191`	`1192`	`}`
`1192`	`1193`	`if (builtinsns == NULL) {`
`1193`		`- builtinsns = PyFunction_GET_BUILTINS(codearg);`
	`1194`	`+ builtinsns = _PyFunction_GET_BUILTINS(codearg);`
`1194`	`1195`	`}`
`1195`	`1196`	`codearg = PyFunction_GET_CODE(codearg);`
`1196`	`1197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1256,7 +1256,7 @@ _PyFunction_VerifyStateless(PyThreadState tstate, PyObject func)`
`1256`	`1256`	`return -1;`
`1257`	`1257`	`}`
`1258`	`1258`	`// Check the builtins.`
`1259`		`- PyObject *builtinsns = PyFunction_GET_BUILTINS(func);`
	`1259`	`+ PyObject *builtinsns = _PyFunction_GET_BUILTINS(func);`
`1260`	`1260`	`if (builtinsns != NULL && !PyDict_Check(builtinsns)) {`
`1261`	`1261`	`_PyErr_Format(tstate, PyExc_TypeError,`
`1262`	`1262`	`"unsupported builtins %R", builtinsns);`