fix error

Author: NekoAsakura

Include/internal/pycore_opcode_utils.h

@@ -82,11 +82,11 @@ extern "C" {
 #define CONSTANT_MINUS_ONE 11
 #define NUM_COMMON_CONSTANTS 12
 
-extern PyCFunctionObject _PyBuiltin_All;
-extern PyCFunctionObject _PyBuiltin_Any;
+PyAPI_DATA(PyCFunctionObject) _PyBuiltin_All;
+PyAPI_DATA(PyCFunctionObject) _PyBuiltin_Any;
 
 /* Filled once by pycore_init_builtins; every entry is immortal. */
-extern PyObject *_PyCommonConsts[NUM_COMMON_CONSTANTS];
+PyAPI_DATA(PyObject *) _PyCommonConsts[NUM_COMMON_CONSTANTS];
 
 /* Non-static: used by static _PyBuiltin_All/_Any in bltinmodule.c. */
 extern PyObject *_PyCFunction_vectorcall_O(

Objects/methodobject.c

@@ -353,6 +353,12 @@ 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)
@@ -388,6 +394,15 @@ PyTypeObject PyCFunction_Type = {
     meth_getsets,                               /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    0,                                          /* tp_init */
+    0,                                          /* tp_alloc */
+    0,                                          /* tp_new */
+    0,                                          /* tp_free */
+    /* Static immortal instances have no PyGC_Head prefix. */
+    cfunction_is_gc,                            /* tp_is_gc */
 };
 
 PyTypeObject PyCMethod_Type = {

Programs/test_frozenmain.h

@@ -468,7 +468,7 @@ static PyMethodDef _PyBuiltin_All_methoddef = {
     "all", (PyCFunction)builtin_all, METH_O, builtin_all__doc__,
 };
 
-Py_EXPORTED_SYMBOL PyCFunctionObject _PyBuiltin_All = {
+PyCFunctionObject _PyBuiltin_All = {
     .ob_base = _PyObject_HEAD_INIT(&PyCFunction_Type),
     .m_ml = &_PyBuiltin_All_methoddef,
     .m_self = NULL,
@@ -481,7 +481,7 @@ static PyMethodDef _PyBuiltin_Any_methoddef = {
     "any", (PyCFunction)builtin_any, METH_O, builtin_any__doc__,
 };
 
-Py_EXPORTED_SYMBOL PyCFunctionObject _PyBuiltin_Any = {
+PyCFunctionObject _PyBuiltin_Any = {
     .ob_base = _PyObject_HEAD_INIT(&PyCFunction_Type),
     .m_ml = &_PyBuiltin_Any_methoddef,
     .m_self = NULL,
@@ -490,7 +490,7 @@ Py_EXPORTED_SYMBOL PyCFunctionObject _PyBuiltin_Any = {
     .vectorcall = _PyCFunction_vectorcall_O,
 };
 
-Py_EXPORTED_SYMBOL PyObject *_PyCommonConsts[NUM_COMMON_CONSTANTS];
+PyObject *_PyCommonConsts[NUM_COMMON_CONSTANTS];
 
 /*[clinic input]
 ascii as builtin_ascii

Python/bltinmodule.c

@@ -869,12 +869,12 @@ pycore_init_builtins(PyThreadState *tstate)
     interp->callable_cache.len = len;
 
     /* Install the static all/any singletons. */
-    if (PyDict_SetItemString(builtins_dict, "all",
-                             (PyObject *)&_PyBuiltin_All) < 0) {
+    if (PyDict_SetItem(builtins_dict, &_Py_ID(all),
+                       (PyObject *)&_PyBuiltin_All) < 0) {
         goto error;
     }
-    if (PyDict_SetItemString(builtins_dict, "any",
-                             (PyObject *)&_PyBuiltin_Any) < 0) {
+    if (PyDict_SetItem(builtins_dict, &_Py_ID(any),
+                       (PyObject *)&_PyBuiltin_Any) < 0) {
         goto error;
     }
 

Python/pylifecycle.c

@@ -1810,6 +1810,7 @@ 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: