revert any/all static-ification

Author: NekoAsakura

Include/internal/pycore_opcode_utils.h

@@ -82,13 +82,6 @@ extern "C" {
 #define CONSTANT_MINUS_ONE 11
 #define NUM_COMMON_CONSTANTS 12
 
-PyAPI_DATA(PyCFunctionObject) _PyBuiltin_All;
-PyAPI_DATA(PyCFunctionObject) _PyBuiltin_Any;
-
-/* Non-static: used by static _PyBuiltin_All/_Any in bltinmodule.c. */
-extern PyObject *_PyCFunction_vectorcall_O(
-    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-
 /* Values used in the oparg for RESUME */
 #define RESUME_AT_FUNC_START 0
 #define RESUME_AFTER_YIELD 1

Objects/methodobject.c

@@ -25,8 +25,7 @@ static PyObject * cfunction_vectorcall_FASTCALL_KEYWORDS_METHOD(
     PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
 static PyObject * cfunction_vectorcall_NOARGS(
     PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-/* Non-static: used by static _PyBuiltin_All/_Any in bltinmodule.c. */
-PyObject *_PyCFunction_vectorcall_O(
+static PyObject * cfunction_vectorcall_O(
     PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
 static PyObject * cfunction_call(
     PyObject *func, PyObject *args, PyObject *kwargs);
@@ -68,7 +67,7 @@ PyCMethod_New(PyMethodDef *ml, PyObject *self, PyObject *module, PyTypeObject *c
             vectorcall = cfunction_vectorcall_NOARGS;
             break;
         case METH_O:
-            vectorcall = _PyCFunction_vectorcall_O;
+            vectorcall = cfunction_vectorcall_O;
             break;
         case METH_METHOD | METH_FASTCALL | METH_KEYWORDS:
             vectorcall = cfunction_vectorcall_FASTCALL_KEYWORDS_METHOD;
@@ -353,12 +352,6 @@ meth_hash(PyObject *self)
     return x;
 }
 
-static int
-cfunction_is_gc(PyObject *op)
-{
-    return !_Py_IsStaticImmortal(op);
-}
-
 
 PyTypeObject PyCFunction_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
@@ -394,7 +387,6 @@ PyTypeObject PyCFunction_Type = {
     meth_getsets,                               /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
-    .tp_is_gc = cfunction_is_gc,
 };
 
 PyTypeObject PyCMethod_Type = {
@@ -519,8 +511,8 @@ cfunction_vectorcall_NOARGS(
     return result;
 }
 
-PyObject *
-_PyCFunction_vectorcall_O(
+static PyObject *
+cfunction_vectorcall_O(
     PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
 {
     PyThreadState *tstate = _PyThreadState_GET();

Python/bltinmodule.c

@@ -13,7 +13,6 @@
 #include "pycore_long.h"          // _PyLong_CompactValue
 #include "pycore_modsupport.h"    // _PyArg_NoKwnames()
 #include "pycore_object.h"        // _Py_AddToAllObjects()
-#include "pycore_opcode_utils.h"  // _PyBuiltin_All, _PyBuiltin_Any, _PyCFunction_vectorcall_O
 #include "pycore_pyerrors.h"      // _PyErr_NoMemory()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_pythonrun.h"     // _Py_SourceAsString()
@@ -464,32 +463,6 @@ builtin_any(PyObject *module, PyObject *iterable)
     Py_RETURN_FALSE;
 }
 
-static PyMethodDef _PyBuiltin_All_methoddef = {
-    "all", (PyCFunction)builtin_all, METH_O, builtin_all__doc__,
-};
-
-PyCFunctionObject _PyBuiltin_All = {
-    .ob_base = _PyObject_HEAD_INIT(&PyCFunction_Type),
-    .m_ml = &_PyBuiltin_All_methoddef,
-    .m_self = NULL,
-    .m_module = (PyObject *)&_Py_ID(builtins),
-    .m_weakreflist = NULL,
-    .vectorcall = _PyCFunction_vectorcall_O,
-};
-
-static PyMethodDef _PyBuiltin_Any_methoddef = {
-    "any", (PyCFunction)builtin_any, METH_O, builtin_any__doc__,
-};
-
-PyCFunctionObject _PyBuiltin_Any = {
-    .ob_base = _PyObject_HEAD_INIT(&PyCFunction_Type),
-    .m_ml = &_PyBuiltin_Any_methoddef,
-    .m_self = NULL,
-    .m_module = (PyObject *)&_Py_ID(builtins),
-    .m_weakreflist = NULL,
-    .vectorcall = _PyCFunction_vectorcall_O,
-};
-
 /*[clinic input]
 ascii as builtin_ascii
 
@@ -3457,6 +3430,8 @@ static PyMethodDef builtin_methods[] = {
     BUILTIN___IMPORT___METHODDEF
     BUILTIN___LAZY_IMPORT___METHODDEF
     BUILTIN_ABS_METHODDEF
+    BUILTIN_ALL_METHODDEF
+    BUILTIN_ANY_METHODDEF
     BUILTIN_ASCII_METHODDEF
     BUILTIN_BIN_METHODDEF
     {"breakpoint", _PyCFunction_CAST(builtin_breakpoint), METH_FASTCALL | METH_KEYWORDS, breakpoint_doc},

Python/pylifecycle.c

@@ -18,7 +18,6 @@
 #include "pycore_moduleobject.h"  // _PyModule_InitModuleDictWatcher()
 #include "pycore_object.h"        // _PyDebug_PrintTotalRefs()
 #include "pycore_obmalloc.h"      // _PyMem_init_obmalloc()
-#include "pycore_opcode_utils.h"  // _PyBuiltin_All, _PyBuiltin_Any
 #include "pycore_optimizer.h"     // _Py_Executors_InvalidateAll
 #include "pycore_pathconfig.h"    // _PyPathConfig_UpdateGlobal()
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
@@ -868,21 +867,21 @@ pycore_init_builtins(PyThreadState *tstate)
     }
     interp->callable_cache.len = len;
 
-    /* Install the static all/any singletons. */
-    if (PyDict_SetItem(builtins_dict, &_Py_ID(all),
-                       (PyObject *)&_PyBuiltin_All) < 0) {
+    PyObject *all = PyDict_GetItemWithError(builtins_dict, &_Py_ID(all));
+    if (!all) {
         goto error;
     }
-    if (PyDict_SetItem(builtins_dict, &_Py_ID(any),
-                       (PyObject *)&_PyBuiltin_Any) < 0) {
+
+    PyObject *any = PyDict_GetItemWithError(builtins_dict, &_Py_ID(any));
+    if (!any) {
         goto error;
     }
 
     interp->common_consts[CONSTANT_ASSERTIONERROR] = PyExc_AssertionError;
     interp->common_consts[CONSTANT_NOTIMPLEMENTEDERROR] = PyExc_NotImplementedError;
     interp->common_consts[CONSTANT_BUILTIN_TUPLE] = (PyObject *)&PyTuple_Type;
-    interp->common_consts[CONSTANT_BUILTIN_ALL] = (PyObject *)&_PyBuiltin_All;
-    interp->common_consts[CONSTANT_BUILTIN_ANY] = (PyObject *)&_PyBuiltin_Any;
+    interp->common_consts[CONSTANT_BUILTIN_ALL] = all;
+    interp->common_consts[CONSTANT_BUILTIN_ANY] = any;
     interp->common_consts[CONSTANT_BUILTIN_LIST] = (PyObject *)&PyList_Type;
     interp->common_consts[CONSTANT_BUILTIN_SET] = (PyObject *)&PySet_Type;
     interp->common_consts[CONSTANT_NONE] = Py_None;
@@ -894,7 +893,6 @@ pycore_init_builtins(PyThreadState *tstate)
         (PyObject *)&_PyLong_SMALL_INTS[_PY_NSMALLNEGINTS - 1];
     for (int i = 0; i < NUM_COMMON_CONSTANTS; i++) {
         assert(interp->common_consts[i] != NULL);
-        assert(_Py_IsStaticImmortal(interp->common_consts[i]));
     }
 
     PyObject *list_append = _PyType_Lookup(&PyList_Type, &_Py_ID(append));

Tools/c-analyzer/cpython/ignored.tsv

@@ -49,9 +49,6 @@ Modules/getbuildinfo.c	-	buildinfo	-
 Modules/getbuildinfo.c	-	initialized	-
 Python/getversion.c	-	initialized	-
 Python/getversion.c	-	version	-
-## builtin singletons
-Python/bltinmodule.c	-	_PyBuiltin_All	-
-Python/bltinmodule.c	-	_PyBuiltin_Any	-
 
 ## public C-API - set during first init
 Python/bootstrap_hash.c	-	_Py_HashSecret_Initialized	-

Tools/gdb/libpython.py

@@ -1810,7 +1810,6 @@ def is_other_python_frame(self):
             return False
 
         if (caller.startswith('cfunction_vectorcall_') or
-            caller.startswith('_PyCFunction_vectorcall_') or
             caller == 'cfunction_call'):
             arg_name = 'func'
             # Within that frame: