bpo-46541: Replace core use of _Py_IDENTIFIER() with statically initialized global objects.

.github/workflows/build.yml

@@ -100,6 +100,8 @@ jobs:
         run: make smelly
       - name: Check limited ABI symbols
         run: make check-limited-abi
+      - name: Check global objects
+        run: make check-global-objects
 
   build_win32:
     name: 'Windows (x86)'

Include/abstract.h

@@ -137,7 +137,7 @@ extern "C" {
 
 #ifdef PY_SSIZE_T_CLEAN
 #  define PyObject_CallFunction _PyObject_CallFunction_SizeT
-#  define PyObject_CallMethod _PyObject_CallMethod_SizeT
+#  define PyObject_CallMethod _PyObject_CallMethodString_SizeT
 #endif
 
 
@@ -199,10 +199,10 @@ PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
                                                     const char *format,
                                                     ...);
 
-PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj,
-                                                  const char *name,
-                                                  const char *format,
-                                                  ...);
+PyAPI_FUNC(PyObject *) _PyObject_CallMethodString_SizeT(PyObject *obj,
+                                                        const char *name,
+                                                        const char *format,
+                                                        ...);
 
 /* Call a callable Python object 'callable' with a variable number of C
    arguments. The C arguments are provided as PyObject* values, terminated

Include/cpython/abstract.h

@@ -5,6 +5,7 @@
 /* === Object Protocol ================================================== */
 
 #ifdef PY_SSIZE_T_CLEAN
+#  define _PyObject_CallMethod _PyObject_CallMethod_SizeT
 #  define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT
 #endif
 
@@ -116,12 +117,21 @@ PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg)
            2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
 }
 
+PyAPI_FUNC(PyObject *) _PyObject_CallMethod(PyObject *obj,
+                                            PyObject *name,
+                                            const char *format, ...);
+
 /* Like PyObject_CallMethod(), but expect a _Py_Identifier*
    as the method name. */
 PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj,
                                               _Py_Identifier *name,
                                               const char *format, ...);
 
+PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj,
+                                                  PyObject *name,
+                                                  const char *format,
+                                                  ...);
+
 PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj,
                                                     _Py_Identifier *name,
                                                     const char *format,

Include/cpython/ceval.h

@@ -15,6 +15,7 @@ PyAPI_FUNC(int) _PyEval_SetAsyncGenFinalizer(PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
 
 /* Helper to look up a builtin object */
+PyAPI_FUNC(PyObject *) _PyEval_GetBuiltin(PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
 /* Look at the current frame's (if any) code's co_flags, and turn on
    the corresponding compiler flags in cf->cf_flags.  Return 1 if any

Include/cpython/dictobject.h

@@ -30,6 +30,7 @@ typedef struct {
 
 PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
                                        Py_hash_t hash);
+PyAPI_FUNC(PyObject *) _PyDict_GetItemWithError(PyObject *dp, PyObject *key);
 PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
                                                   struct _Py_Identifier *key);
 PyAPI_FUNC(PyObject *) _PyDict_GetItemStringWithError(PyObject *, const char *);

Include/cpython/object.h

@@ -41,10 +41,16 @@ typedef struct _Py_Identifier {
     Py_ssize_t index;
 } _Py_Identifier;
 
+#if !defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
+// For now we are keeping _Py_IDENTIFIER for continued use
+// in non-builtin extensions (and naughty PyPI modules).
+
 #define _Py_static_string_init(value) { .string = value, .index = -1 }
 #define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
 #define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
 
+#endif  /* ! Py_BUILD_CORE */
+
 /* buffer interface */
 typedef struct bufferinfo {
     void *buf;
@@ -296,7 +302,8 @@ typedef struct _heaptypeobject {
 PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *);
 PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
-PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
+PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyObject_LookupSpecialId(PyObject *, _Py_Identifier *);
 PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
 PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);

Include/cpython/sysmodule.h

@@ -2,6 +2,8 @@
 #  error "this header file must not be included directly"
 #endif
 
+PyAPI_FUNC(PyObject *) _PySys_GetAttr(PyThreadState *tstate,
+                                      PyObject *name);
 PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
 PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
 

Include/internal/pycore_call.h

@@ -30,6 +30,9 @@ PyAPI_FUNC(PyObject *) _PyObject_Call(
     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

Include/internal/pycore_global_objects.h

@@ -8,6 +8,8 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+#include "pycore_global_strings.h"  // struct _Py_global_strings
+
 
 // These would be in pycore_long.h if it weren't for an include cycle.
 #define _PY_NSMALLPOSINTS           257
@@ -36,6 +38,8 @@ struct _Py_global_objects {
             PyBytesObject ob;
             char eos;
         } bytes_characters[256];
+
+        struct _Py_global_strings strings;
     } singletons;
 };