From c63f37286b438904d42aad22f9b4119f352eb0a4 Mon Sep 17 00:00:00 2001 From: Eddie Elizondo Date: Thu, 6 Apr 2023 01:28:49 -0400 Subject: [PATCH 1/3] Implement _PyObject_HEAD_IMMORTAL_INIT and _PyVarObject_HEAD_IMMORTAL_INIT --- Doc/includes/custom.c | 2 +- Doc/includes/custom2.c | 2 +- Doc/includes/custom3.c | 2 +- Doc/includes/custom4.c | 2 +- Doc/includes/sublist.c | 2 +- Include/object.h | 8 +- Lib/test/clinic.test | 48 ++--- Modules/_blake2/clinic/blake2b_impl.c.h | 2 +- Modules/_blake2/clinic/blake2s_impl.c.h | 2 +- Modules/_collectionsmodule.c | 10 +- Modules/_ctypes/_ctypes.c | 32 +-- Modules/_ctypes/callbacks.c | 2 +- Modules/_ctypes/callproc.c | 2 +- Modules/_ctypes/cfield.c | 2 +- Modules/_ctypes/stgdict.c | 2 +- Modules/_cursesmodule.c | 2 +- Modules/_datetimemodule.c | 14 +- Modules/_decimal/_decimal.c | 8 +- Modules/_io/bufferedio.c | 2 +- Modules/_io/bytesio.c | 2 +- Modules/_io/clinic/_iomodule.c.h | 4 +- Modules/_io/clinic/bufferedio.c.h | 6 +- Modules/_io/clinic/bytesio.c.h | 2 +- Modules/_io/clinic/fileio.c.h | 2 +- Modules/_io/clinic/stringio.c.h | 2 +- Modules/_io/clinic/textio.c.h | 8 +- Modules/_io/clinic/winconsoleio.c.h | 2 +- Modules/_io/iobase.c | 4 +- Modules/_io/textio.c | 4 +- Modules/_io/winconsoleio.c | 2 +- .../_multiprocessing/clinic/posixshmem.c.h | 4 +- Modules/_multiprocessing/clinic/semaphore.c.h | 6 +- Modules/_sha3/clinic/sha3module.c.h | 2 +- Modules/_sqlite/clinic/connection.c.h | 22 +- Modules/_sqlite/clinic/cursor.c.h | 2 +- Modules/_sqlite/clinic/module.c.h | 2 +- Modules/_sre/clinic/sre.c.h | 26 +-- Modules/_ssl/clinic/cert.c.h | 2 +- Modules/_testbuffer.c | 4 +- Modules/_testcapi/structmember.c | 2 +- Modules/_testcapi/vectorcall.c | 8 +- Modules/_testcapimodule.c | 22 +- Modules/cjkcodecs/clinic/multibytecodec.c.h | 8 +- Modules/clinic/_asynciomodule.c.h | 24 +-- Modules/clinic/_bisectmodule.c.h | 8 +- Modules/clinic/_bz2module.c.h | 2 +- Modules/clinic/_codecsmodule.c.h | 4 +- Modules/clinic/_csv.c.h | 6 +- Modules/clinic/_cursesmodule.c.h | 2 +- Modules/clinic/_datetimemodule.c.h | 4 +- Modules/clinic/_elementtree.c.h | 16 +- Modules/clinic/_functoolsmodule.c.h | 2 +- Modules/clinic/_hashopenssl.c.h | 40 ++-- Modules/clinic/_lzmamodule.c.h | 4 +- Modules/clinic/_opcode.c.h | 2 +- Modules/clinic/_pickle.c.h | 12 +- Modules/clinic/_queuemodule.c.h | 6 +- Modules/clinic/_ssl.c.h | 18 +- Modules/clinic/_struct.c.h | 6 +- Modules/clinic/_testclinic.c.h | 44 ++-- Modules/clinic/_testinternalcapi.c.h | 4 +- Modules/clinic/_testmultiphase.c.h | 2 +- Modules/clinic/_winapi.c.h | 12 +- Modules/clinic/_zoneinfo.c.h | 6 +- Modules/clinic/binascii.c.h | 14 +- Modules/clinic/cmathmodule.c.h | 2 +- Modules/clinic/gcmodule.c.h | 4 +- Modules/clinic/grpmodule.c.h | 4 +- Modules/clinic/itertoolsmodule.c.h | 16 +- Modules/clinic/mathmodule.c.h | 4 +- Modules/clinic/md5module.c.h | 2 +- Modules/clinic/overlapped.c.h | 2 +- Modules/clinic/posixmodule.c.h | 188 +++++++++--------- Modules/clinic/pyexpat.c.h | 2 +- Modules/clinic/selectmodule.c.h | 10 +- Modules/clinic/sha1module.c.h | 2 +- Modules/clinic/sha2module.c.h | 8 +- Modules/clinic/socketmodule.c.h | 2 +- Modules/clinic/syslogmodule.c.h | 2 +- Modules/clinic/zlibmodule.c.h | 12 +- Modules/ossaudiodev.c | 4 +- Modules/socketmodule.c | 2 +- Modules/xxmodule.c | 6 +- Modules/xxsubtype.c | 4 +- Objects/boolobject.c | 2 +- Objects/bytearrayobject.c | 4 +- Objects/bytesobject.c | 4 +- Objects/capsule.c | 2 +- Objects/cellobject.c | 2 +- Objects/classobject.c | 4 +- Objects/clinic/bytearrayobject.c.h | 14 +- Objects/clinic/bytesobject.c.h | 14 +- Objects/clinic/codeobject.c.h | 4 +- Objects/clinic/complexobject.c.h | 2 +- Objects/clinic/descrobject.c.h | 4 +- Objects/clinic/enumobject.c.h | 2 +- Objects/clinic/funcobject.c.h | 2 +- Objects/clinic/listobject.c.h | 2 +- Objects/clinic/longobject.c.h | 6 +- Objects/clinic/memoryobject.c.h | 8 +- Objects/clinic/moduleobject.c.h | 2 +- Objects/clinic/odictobject.c.h | 10 +- Objects/clinic/structseq.c.h | 2 +- Objects/clinic/unicodeobject.c.h | 12 +- Objects/codeobject.c | 6 +- Objects/complexobject.c | 2 +- Objects/descrobject.c | 16 +- Objects/dictobject.c | 20 +- Objects/enumobject.c | 4 +- Objects/exceptions.c | 16 +- Objects/fileobject.c | 2 +- Objects/floatobject.c | 2 +- Objects/frameobject.c | 2 +- Objects/funcobject.c | 6 +- Objects/genericaliasobject.c | 4 +- Objects/genobject.c | 14 +- Objects/interpreteridobject.c | 2 +- Objects/iterobject.c | 6 +- Objects/listobject.c | 6 +- Objects/longobject.c | 2 +- Objects/memoryobject.c | 6 +- Objects/methodobject.c | 4 +- Objects/moduleobject.c | 4 +- Objects/namespaceobject.c | 2 +- Objects/object.c | 4 +- Objects/odictobject.c | 10 +- Objects/picklebufobject.c | 2 +- Objects/rangeobject.c | 6 +- Objects/setobject.c | 8 +- Objects/sliceobject.c | 4 +- Objects/stringlib/clinic/transmogrify.h.h | 2 +- Objects/stringlib/unicode_format.h | 4 +- Objects/tupleobject.c | 4 +- Objects/typeobject.c | 6 +- Objects/unicodeobject.c | 8 +- Objects/unionobject.c | 2 +- Objects/weakrefobject.c | 6 +- PC/_msi.c | 8 +- PC/clinic/_testconsole.c.h | 4 +- PC/clinic/_wmimodule.cpp.h | 2 +- PC/clinic/winreg.c.h | 10 +- PC/clinic/winsound.c.h | 6 +- PC/winreg.c | 2 +- Python/bltinmodule.c | 6 +- Python/clinic/Python-tokenize.c.h | 2 +- Python/clinic/_warnings.c.h | 4 +- Python/clinic/bltinmodule.c.h | 14 +- Python/clinic/import.c.h | 4 +- Python/clinic/sysmodule.c.h | 8 +- Python/clinic/traceback.c.h | 2 +- Python/context.c | 8 +- Python/hamt.c | 14 +- Python/symtable.c | 2 +- Python/traceback.c | 2 +- Tools/clinic/clinic.py | 2 +- 155 files changed, 603 insertions(+), 599 deletions(-) diff --git a/Doc/includes/custom.c b/Doc/includes/custom.c index 26ca754964733d..0c5e903cd136c4 100644 --- a/Doc/includes/custom.c +++ b/Doc/includes/custom.c @@ -7,7 +7,7 @@ typedef struct { } CustomObject; static PyTypeObject CustomType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "custom.Custom", .tp_doc = PyDoc_STR("Custom objects"), .tp_basicsize = sizeof(CustomObject), diff --git a/Doc/includes/custom2.c b/Doc/includes/custom2.c index a3b2d6ab78d3c4..048d273624a7b3 100644 --- a/Doc/includes/custom2.c +++ b/Doc/includes/custom2.c @@ -90,7 +90,7 @@ static PyMethodDef Custom_methods[] = { }; static PyTypeObject CustomType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "custom2.Custom", .tp_doc = PyDoc_STR("Custom objects"), .tp_basicsize = sizeof(CustomObject), diff --git a/Doc/includes/custom3.c b/Doc/includes/custom3.c index 1a68bc4be8c399..5565576cbc4abf 100644 --- a/Doc/includes/custom3.c +++ b/Doc/includes/custom3.c @@ -130,7 +130,7 @@ static PyMethodDef Custom_methods[] = { }; static PyTypeObject CustomType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "custom3.Custom", .tp_doc = PyDoc_STR("Custom objects"), .tp_basicsize = sizeof(CustomObject), diff --git a/Doc/includes/custom4.c b/Doc/includes/custom4.c index b932d159d26e93..32bb56a61fabd6 100644 --- a/Doc/includes/custom4.c +++ b/Doc/includes/custom4.c @@ -146,7 +146,7 @@ static PyMethodDef Custom_methods[] = { }; static PyTypeObject CustomType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "custom4.Custom", .tp_doc = PyDoc_STR("Custom objects"), .tp_basicsize = sizeof(CustomObject), diff --git a/Doc/includes/sublist.c b/Doc/includes/sublist.c index b36dadf07eae87..c3283213e79d0a 100644 --- a/Doc/includes/sublist.c +++ b/Doc/includes/sublist.c @@ -29,7 +29,7 @@ SubList_init(SubListObject *self, PyObject *args, PyObject *kwds) } static PyTypeObject SubListType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "sublist.SubList", .tp_doc = PyDoc_STR("SubList objects"), .tp_basicsize = sizeof(SubListObject), diff --git a/Include/object.h b/Include/object.h index 2943a6066818cd..f7a5f0381d1f8a 100644 --- a/Include/object.h +++ b/Include/object.h @@ -82,8 +82,12 @@ whose size is determined when the object is allocated. { _PyObject_EXTRA_INIT \ 1, (type) }, -#define PyVarObject_HEAD_INIT(type, size) \ - { PyObject_HEAD_INIT(type) (size) }, +#define _PyObject_HEAD_IMMORTAL_INIT(type) \ + { _PyObject_EXTRA_INIT \ + 999999999, (type) }, + +#define _PyVarObject_HEAD_IMMORTAL_INIT(type, size) \ + { _PyObject_HEAD_IMMORTAL_INIT(type) (size) }, /* PyObject_VAR_HEAD defines the initial segment of all variable-size * container objects. These end with a declaration of an array with 1 diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test index 53e5df5ba872ed..92ef9ef3416bbb 100644 --- a/Lib/test/clinic.test +++ b/Lib/test/clinic.test @@ -1927,7 +1927,7 @@ test_keywords(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -1997,7 +1997,7 @@ test_keywords_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -2068,7 +2068,7 @@ test_keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2154,7 +2154,7 @@ test_keywords_opt_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2250,7 +2250,7 @@ test_keywords_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2333,7 +2333,7 @@ test_posonly_keywords(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -2404,7 +2404,7 @@ test_posonly_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2477,7 +2477,7 @@ test_posonly_keywords_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2553,7 +2553,7 @@ test_posonly_keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2640,7 +2640,7 @@ test_posonly_keywords_opt2(PyObject *module, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2726,7 +2726,7 @@ test_posonly_opt_keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2820,7 +2820,7 @@ test_posonly_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2908,7 +2908,7 @@ test_posonly_kwonly_opt2(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -2995,7 +2995,7 @@ test_posonly_opt_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -3091,7 +3091,7 @@ test_posonly_keywords_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssi PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), }, }; #undef NUM_KEYWORDS @@ -3183,7 +3183,7 @@ test_posonly_keywords_kwonly_opt2(PyObject *module, PyObject *const *args, Py_ss PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -3275,7 +3275,7 @@ test_posonly_keywords_opt_kwonly_opt(PyObject *module, PyObject *const *args, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), }, }; #undef NUM_KEYWORDS @@ -3379,7 +3379,7 @@ test_posonly_keywords_opt2_kwonly_opt(PyObject *module, PyObject *const *args, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), }, }; #undef NUM_KEYWORDS @@ -3490,7 +3490,7 @@ test_posonly_opt_keywords_opt_kwonly_opt(PyObject *module, PyObject *const *args PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), &_Py_ID(f), }, }; #undef NUM_KEYWORDS @@ -3599,7 +3599,7 @@ test_keyword_only_parameter(PyObject *module, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(co_lnotab), }, }; #undef NUM_KEYWORDS @@ -3830,7 +3830,7 @@ test_vararg(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), }, }; #undef NUM_KEYWORDS @@ -3902,7 +3902,7 @@ test_vararg_with_default(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -3985,7 +3985,7 @@ test_vararg_with_only_defaults(PyObject *module, PyObject *const *args, Py_ssize PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -4068,7 +4068,7 @@ test_paramname_module(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(module), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_blake2/clinic/blake2b_impl.c.h b/Modules/_blake2/clinic/blake2b_impl.c.h index 99b0f098cc2b27..3609b3eb58f4f8 100644 --- a/Modules/_blake2/clinic/blake2b_impl.c.h +++ b/Modules/_blake2/clinic/blake2b_impl.c.h @@ -36,7 +36,7 @@ py_blake2b_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(digest_size), &_Py_ID(key), &_Py_ID(salt), &_Py_ID(person), &_Py_ID(fanout), &_Py_ID(depth), &_Py_ID(leaf_size), &_Py_ID(node_offset), &_Py_ID(node_depth), &_Py_ID(inner_size), &_Py_ID(last_node), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_blake2/clinic/blake2s_impl.c.h b/Modules/_blake2/clinic/blake2s_impl.c.h index 9b821fbcd62cdb..c1bc4ea9ce6ea3 100644 --- a/Modules/_blake2/clinic/blake2s_impl.c.h +++ b/Modules/_blake2/clinic/blake2s_impl.c.h @@ -36,7 +36,7 @@ py_blake2s_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(digest_size), &_Py_ID(key), &_Py_ID(salt), &_Py_ID(person), &_Py_ID(fanout), &_Py_ID(depth), &_Py_ID(leaf_size), &_Py_ID(node_offset), &_Py_ID(node_depth), &_Py_ID(inner_size), &_Py_ID(last_node), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 9d8aef1e677157..77a7bbc63bd25c 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1603,7 +1603,7 @@ PyDoc_STRVAR(deque_doc, A list-like sequence optimized for data accesses near its endpoints."); static PyTypeObject deque_type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "collections.deque", /* tp_name */ sizeof(dequeobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1770,7 +1770,7 @@ static PyMethodDef dequeiter_methods[] = { }; static PyTypeObject dequeiter_type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_collections._deque_iterator", /* tp_name */ sizeof(dequeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1890,7 +1890,7 @@ dequereviter_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } static PyTypeObject dequereviter_type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_collections._deque_reverse_iterator", /* tp_name */ sizeof(dequeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2204,7 +2204,7 @@ passed to the dict constructor, including keyword arguments.\n\ #define DEFERRED_ADDRESS(ADDR) 0 static PyTypeObject defdict_type = { - PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + _PyVarObject_HEAD_IMMORTAL_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "collections.defaultdict", /* tp_name */ sizeof(defdictobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2488,7 +2488,7 @@ static PyMethodDef tuplegetter_methods[] = { }; static PyTypeObject tuplegetter_type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_collections._tuplegetter", /* tp_name */ sizeof(_tuplegetterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 6f92ca08dd537b..9043814bad4ac0 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -174,7 +174,7 @@ _DictRemover_call(PyObject *myself, PyObject *args, PyObject *kw) } static PyTypeObject DictRemover_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.DictRemover", /* tp_name */ sizeof(DictRemoverObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -427,7 +427,7 @@ StructParam_dealloc(PyObject *myself) static PyTypeObject StructParam_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "_ctypes.StructParam_Type", .tp_basicsize = sizeof(StructParamObject), .tp_dealloc = StructParam_dealloc, @@ -919,7 +919,7 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value) PyTypeObject PyCStructType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.PyCStructType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -961,7 +961,7 @@ PyTypeObject PyCStructType_Type = { }; static PyTypeObject UnionType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.UnionType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1216,7 +1216,7 @@ static PyMethodDef PyCPointerType_methods[] = { }; PyTypeObject PyCPointerType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.PyCPointerType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1588,7 +1588,7 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } PyTypeObject PyCArrayType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.PyCArrayType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2271,7 +2271,7 @@ static PyMethodDef PyCSimpleType_methods[] = { }; PyTypeObject PyCSimpleType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.PyCSimpleType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2551,7 +2551,7 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } PyTypeObject PyCFuncPtrType_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.PyCFuncPtrType", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2870,7 +2870,7 @@ static PyMethodDef PyCData_methods[] = { }; PyTypeObject PyCData_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes._CData", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4251,7 +4251,7 @@ static PyNumberMethods PyCFuncPtr_as_number = { }; PyTypeObject PyCFuncPtr_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.CFuncPtr", sizeof(PyCFuncPtrObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4402,7 +4402,7 @@ Struct_init(PyObject *self, PyObject *args, PyObject *kwds) } static PyTypeObject Struct_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.Structure", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4444,7 +4444,7 @@ static PyTypeObject Struct_Type = { }; static PyTypeObject Union_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.Union", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4764,7 +4764,7 @@ static PyMappingMethods Array_as_mapping = { }; PyTypeObject PyCArray_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.Array", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4982,7 +4982,7 @@ Simple_repr(CDataObject *self) } static PyTypeObject Simple_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes._SimpleCData", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -5364,7 +5364,7 @@ static PyNumberMethods Pointer_as_number = { }; PyTypeObject PyCPointer_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes._Pointer", sizeof(CDataObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -5455,7 +5455,7 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds) } static PyTypeObject PyComError_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.COMError", /* tp_name */ sizeof(PyBaseExceptionObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index bc8750091f65f3..7000bde1992cd4 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -62,7 +62,7 @@ CThunkObject_clear(PyObject *myself) } PyTypeObject PyCThunk_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.CThunkObject", sizeof(CThunkObject), /* tp_basicsize */ sizeof(ffi_type), /* tp_itemsize */ diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 4438727332bc11..588c67158fc2d0 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -568,7 +568,7 @@ static PyMemberDef PyCArgType_members[] = { }; PyTypeObject PyCArg_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "CArgObject", sizeof(PyCArgObject), 0, diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 796a1bec966de1..22c0bf2eedfdd6 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -297,7 +297,7 @@ PyCField_repr(CFieldObject *self) } PyTypeObject PyCField_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_ctypes.CField", /* tp_name */ sizeof(CFieldObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c index 83a52757d60979..81236b9cf427e5 100644 --- a/Modules/_ctypes/stgdict.c +++ b/Modules/_ctypes/stgdict.c @@ -136,7 +136,7 @@ static struct PyMethodDef PyCStgDict_methods[] = { }; PyTypeObject PyCStgDict_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "StgDict", sizeof(StgDictObject), 0, diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 5691a419a32f8e..55217729ef0e42 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -2572,7 +2572,7 @@ static PyGetSetDef PyCursesWindow_getsets[] = { /* -------------------------------------------------------*/ PyTypeObject PyCursesWindow_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_curses.window", /*tp_name*/ sizeof(PyCursesWindowObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index eda8c5610ba659..2b8f4736825085 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -2792,7 +2792,7 @@ static PyNumberMethods delta_as_number = { }; static PyTypeObject PyDateTime_DeltaType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.timedelta", /* tp_name */ sizeof(PyDateTime_Delta), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -3369,7 +3369,7 @@ static PyMethodDef iso_calendar_date_methods[] = { }; static PyTypeObject PyDateTime_IsoCalendarDateType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "datetime.IsoCalendarDate", .tp_basicsize = sizeof(PyDateTime_IsoCalendarDate), .tp_repr = (reprfunc) iso_calendar_date_repr, @@ -3616,7 +3616,7 @@ static PyNumberMethods date_as_number = { }; static PyTypeObject PyDateTime_DateType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.date", /* tp_name */ sizeof(PyDateTime_Date), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -3842,7 +3842,7 @@ static const char tzinfo_doc[] = PyDoc_STR("Abstract base class for time zone info objects."); static PyTypeObject PyDateTime_TZInfoType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.tzinfo", /* tp_name */ sizeof(PyDateTime_TZInfo), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4075,7 +4075,7 @@ static const char timezone_doc[] = PyDoc_STR("Fixed offset from UTC implementation of tzinfo."); static PyTypeObject PyDateTime_TimeZoneType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.timezone", /* tp_name */ sizeof(PyDateTime_TimeZone), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4744,7 +4744,7 @@ All arguments are optional. tzinfo may be None, or an instance of\n\ a tzinfo subclass. The remaining arguments may be ints.\n"); static PyTypeObject PyDateTime_TimeType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.time", /* tp_name */ sizeof(PyDateTime_Time), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -6592,7 +6592,7 @@ static PyNumberMethods datetime_as_number = { }; static PyTypeObject PyDateTime_DateTimeType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "datetime.datetime", /* tp_name */ sizeof(PyDateTime_DateTime), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index 0e11c879732ab6..a31f6161464b0f 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -678,7 +678,7 @@ static PyMethodDef signaldict_methods[] = { static PyTypeObject PyDecSignalDictMixin_Type = { - PyVarObject_HEAD_INIT(0, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(0, 0) "decimal.SignalDictMixin", /* tp_name */ sizeof(PyDecSignalDictObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1834,7 +1834,7 @@ static PyMethodDef ctxmanager_methods[] = { static PyTypeObject PyDecContextManager_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "decimal.ContextManager", /* tp_name */ sizeof(PyDecContextManagerObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4946,7 +4946,7 @@ static PyMethodDef dec_methods [] = static PyTypeObject PyDec_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "decimal.Decimal", /* tp_name */ sizeof(PyDecObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -5631,7 +5631,7 @@ static PyMethodDef context_methods [] = static PyTypeObject PyDecContext_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "decimal.Context", /* tp_name */ sizeof(PyDecContextObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 2c71768be97870..dd9f48944eb507 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2333,7 +2333,7 @@ static PyMethodDef bufferediobase_methods[] = { }; PyTypeObject PyBufferedIOBase_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._BufferedIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 7e9d28b3b9655c..dc7490c89dcfe2 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -1108,7 +1108,7 @@ static PyBufferProcs bytesiobuf_as_buffer = { }; Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._BytesIOBuffer", /*tp_name*/ sizeof(bytesiobuf), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/_io/clinic/_iomodule.c.h b/Modules/_io/clinic/_iomodule.c.h index 4d76e333b0f293..97ef6e3c040309 100644 --- a/Modules/_io/clinic/_iomodule.c.h +++ b/Modules/_io/clinic/_iomodule.c.h @@ -147,7 +147,7 @@ _io_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(mode), &_Py_ID(buffering), &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(newline), &_Py_ID(closefd), &_Py_ID(opener), }, }; #undef NUM_KEYWORDS @@ -370,7 +370,7 @@ _io_open_code(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index d44321bb8b960e..e3586af99b4653 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -416,7 +416,7 @@ _io_BufferedReader___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(raw), &_Py_ID(buffer_size), }, }; #undef NUM_KEYWORDS @@ -493,7 +493,7 @@ _io_BufferedWriter___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(raw), &_Py_ID(buffer_size), }, }; #undef NUM_KEYWORDS @@ -664,7 +664,7 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(raw), &_Py_ID(buffer_size), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h index 84b58db6c7a702..a9f11838f54cd6 100644 --- a/Modules/_io/clinic/bytesio.c.h +++ b/Modules/_io/clinic/bytesio.c.h @@ -497,7 +497,7 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(initial_bytes), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h index b6e9bd5b65a029..7ca3ad9c7776cf 100644 --- a/Modules/_io/clinic/fileio.c.h +++ b/Modules/_io/clinic/fileio.c.h @@ -63,7 +63,7 @@ _io_FileIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(mode), &_Py_ID(closefd), &_Py_ID(opener), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h index d495dd10c16330..60676dceab817d 100644 --- a/Modules/_io/clinic/stringio.c.h +++ b/Modules/_io/clinic/stringio.c.h @@ -269,7 +269,7 @@ _io_StringIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(initial_value), &_Py_ID(newline), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h index db968e884cc805..80165148e54e83 100644 --- a/Modules/_io/clinic/textio.c.h +++ b/Modules/_io/clinic/textio.c.h @@ -38,7 +38,7 @@ _io_IncrementalNewlineDecoder___init__(PyObject *self, PyObject *args, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(decoder), &_Py_ID(translate), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -107,7 +107,7 @@ _io_IncrementalNewlineDecoder_decode(nldecoder_object *self, PyObject *const *ar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(input), &_Py_ID(final), }, }; #undef NUM_KEYWORDS @@ -242,7 +242,7 @@ _io_TextIOWrapper___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(buffer), &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(newline), &_Py_ID(line_buffering), &_Py_ID(write_through), }, }; #undef NUM_KEYWORDS @@ -380,7 +380,7 @@ _io_TextIOWrapper_reconfigure(textio *self, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(newline), &_Py_ID(line_buffering), &_Py_ID(write_through), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h index 4c5cd0892c4a6d..c2e2231f54e8fb 100644 --- a/Modules/_io/clinic/winconsoleio.c.h +++ b/Modules/_io/clinic/winconsoleio.c.h @@ -62,7 +62,7 @@ _io__WindowsConsoleIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(mode), &_Py_ID(closefd), &_Py_ID(opener), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index 682ed000eb1fd9..3be89ad1c5a2cb 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -823,7 +823,7 @@ static PyGetSetDef iobase_getset[] = { PyTypeObject PyIOBase_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._IOBase", /*tp_name*/ sizeof(iobase), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -1017,7 +1017,7 @@ static PyMethodDef rawiobase_methods[] = { }; PyTypeObject PyRawIOBase_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._RawIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 3ff84cb623af74..1248b1b2231e3b 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -147,7 +147,7 @@ static PyGetSetDef textiobase_getset[] = { }; PyTypeObject PyTextIOBase_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._TextIOBase", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -3173,7 +3173,7 @@ static PyGetSetDef incrementalnewlinedecoder_getset[] = { }; PyTypeObject PyIncrementalNewlineDecoder_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io.IncrementalNewlineDecoder", /*tp_name*/ sizeof(nldecoder_object), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c index f836e230243020..364229fc520ef0 100644 --- a/Modules/_io/winconsoleio.c +++ b/Modules/_io/winconsoleio.c @@ -1128,7 +1128,7 @@ static PyMemberDef winconsoleio_members[] = { }; PyTypeObject PyWindowsConsoleIO_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_io._WindowsConsoleIO", sizeof(winconsoleio), 0, diff --git a/Modules/_multiprocessing/clinic/posixshmem.c.h b/Modules/_multiprocessing/clinic/posixshmem.c.h index df2aa29cfe626e..4353d137906b6d 100644 --- a/Modules/_multiprocessing/clinic/posixshmem.c.h +++ b/Modules/_multiprocessing/clinic/posixshmem.c.h @@ -35,7 +35,7 @@ _posixshmem_shm_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(flags), &_Py_ID(mode), }, }; #undef NUM_KEYWORDS @@ -125,7 +125,7 @@ _posixshmem_shm_unlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_multiprocessing/clinic/semaphore.c.h b/Modules/_multiprocessing/clinic/semaphore.c.h index 35347169bc1591..c537e31e775dbb 100644 --- a/Modules/_multiprocessing/clinic/semaphore.c.h +++ b/Modules/_multiprocessing/clinic/semaphore.c.h @@ -35,7 +35,7 @@ _multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(block), &_Py_ID(timeout), }, }; #undef NUM_KEYWORDS @@ -132,7 +132,7 @@ _multiprocessing_SemLock_acquire(SemLockObject *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(block), &_Py_ID(timeout), }, }; #undef NUM_KEYWORDS @@ -220,7 +220,7 @@ _multiprocessing_SemLock(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(kind), &_Py_ID(value), &_Py_ID(maxvalue), &_Py_ID(name), &_Py_ID(unlink), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_sha3/clinic/sha3module.c.h b/Modules/_sha3/clinic/sha3module.c.h index a0c7c1c043e515..9d98933e767c24 100644 --- a/Modules/_sha3/clinic/sha3module.c.h +++ b/Modules/_sha3/clinic/sha3module.c.h @@ -29,7 +29,7 @@ py_sha3_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h index 4c3fd1bd27411b..93d6bbdbc39d00 100644 --- a/Modules/_sqlite/clinic/connection.c.h +++ b/Modules/_sqlite/clinic/connection.c.h @@ -28,7 +28,7 @@ pysqlite_connection_init(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(database), &_Py_ID(timeout), &_Py_ID(detect_types), &_Py_ID(isolation_level), &_Py_ID(check_same_thread), &_Py_ID(factory), &_Py_ID(cached_statements), &_Py_ID(uri), &_Py_ID(autocommit), }, }; #undef NUM_KEYWORDS @@ -170,7 +170,7 @@ pysqlite_connection_cursor(pysqlite_Connection *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(factory), }, }; #undef NUM_KEYWORDS @@ -242,7 +242,7 @@ blobopen(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(readonly), &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -420,7 +420,7 @@ pysqlite_connection_create_function(pysqlite_Connection *self, PyTypeObject *cls PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(narg), &_Py_ID(func), &_Py_ID(deterministic), }, }; #undef NUM_KEYWORDS @@ -584,7 +584,7 @@ pysqlite_connection_create_aggregate(pysqlite_Connection *self, PyTypeObject *cl PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(n_arg), &_Py_ID(aggregate_class), }, }; #undef NUM_KEYWORDS @@ -660,7 +660,7 @@ pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(authorizer_callback), }, }; #undef NUM_KEYWORDS @@ -717,7 +717,7 @@ pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(progress_handler), &_Py_ID(n), }, }; #undef NUM_KEYWORDS @@ -779,7 +779,7 @@ pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(trace_callback), }, }; #undef NUM_KEYWORDS @@ -1038,7 +1038,7 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(target), &_Py_ID(pages), &_Py_ID(progress), &_Py_ID(name), &_Py_ID(sleep), }, }; #undef NUM_KEYWORDS @@ -1219,7 +1219,7 @@ serialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -1308,7 +1308,7 @@ deserialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h index 43e912d1347963..e56a140e0e8b50 100644 --- a/Modules/_sqlite/clinic/cursor.c.h +++ b/Modules/_sqlite/clinic/cursor.c.h @@ -201,7 +201,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(size), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_sqlite/clinic/module.c.h b/Modules/_sqlite/clinic/module.c.h index 12f60835880b10..40ccd98df90a67 100644 --- a/Modules/_sqlite/clinic/module.c.h +++ b/Modules/_sqlite/clinic/module.c.h @@ -32,7 +32,7 @@ pysqlite_complete_statement(PyObject *module, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(statement), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_sre/clinic/sre.c.h b/Modules/_sre/clinic/sre.c.h index da641081ce9e3c..db3d36bf973800 100644 --- a/Modules/_sre/clinic/sre.c.h +++ b/Modules/_sre/clinic/sre.c.h @@ -189,7 +189,7 @@ _sre_SRE_Pattern_match(PatternObject *self, PyTypeObject *cls, PyObject *const * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -282,7 +282,7 @@ _sre_SRE_Pattern_fullmatch(PatternObject *self, PyTypeObject *cls, PyObject *con PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -377,7 +377,7 @@ _sre_SRE_Pattern_search(PatternObject *self, PyTypeObject *cls, PyObject *const PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -469,7 +469,7 @@ _sre_SRE_Pattern_findall(PatternObject *self, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -564,7 +564,7 @@ _sre_SRE_Pattern_finditer(PatternObject *self, PyTypeObject *cls, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -656,7 +656,7 @@ _sre_SRE_Pattern_scanner(PatternObject *self, PyTypeObject *cls, PyObject *const PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(pos), &_Py_ID(endpos), }, }; #undef NUM_KEYWORDS @@ -748,7 +748,7 @@ _sre_SRE_Pattern_split(PatternObject *self, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -822,7 +822,7 @@ _sre_SRE_Pattern_sub(PatternObject *self, PyTypeObject *cls, PyObject *const *ar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(repl), &_Py_ID(string), &_Py_ID(count), }, }; #undef NUM_KEYWORDS @@ -899,7 +899,7 @@ _sre_SRE_Pattern_subn(PatternObject *self, PyTypeObject *cls, PyObject *const *a PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(repl), &_Py_ID(string), &_Py_ID(count), }, }; #undef NUM_KEYWORDS @@ -1001,7 +1001,7 @@ _sre_compile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pattern), &_Py_ID(flags), &_Py_ID(code), &_Py_ID(groups), &_Py_ID(groupindex), &_Py_ID(indexgroup), }, }; #undef NUM_KEYWORDS @@ -1131,7 +1131,7 @@ _sre_SRE_Match_expand(MatchObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(template), }, }; #undef NUM_KEYWORDS @@ -1189,7 +1189,7 @@ _sre_SRE_Match_groups(MatchObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(default), }, }; #undef NUM_KEYWORDS @@ -1252,7 +1252,7 @@ _sre_SRE_Match_groupdict(MatchObject *self, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(default), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_ssl/clinic/cert.c.h b/Modules/_ssl/clinic/cert.c.h index a052ab2086fd96..be4f932b15aa12 100644 --- a/Modules/_ssl/clinic/cert.c.h +++ b/Modules/_ssl/clinic/cert.c.h @@ -31,7 +31,7 @@ _ssl_Certificate_public_bytes(PySSLCertificate *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(format), }, }; #undef NUM_KEYWORDS diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c index 63ed4dc6ca80e1..91c5689ee11715 100644 --- a/Modules/_testbuffer.c +++ b/Modules/_testbuffer.c @@ -2636,7 +2636,7 @@ static PyMethodDef ndarray_methods [] = }; static PyTypeObject NDArray_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "ndarray", /* Name of this type */ sizeof(NDArrayObject), /* Basic object size */ 0, /* Item size for varobject */ @@ -2755,7 +2755,7 @@ static PyBufferProcs staticarray_as_buffer = { }; static PyTypeObject StaticArray_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "staticarray", /* Name of this type */ sizeof(StaticArrayObject), /* Basic object size */ 0, /* Item size for varobject */ diff --git a/Modules/_testcapi/structmember.c b/Modules/_testcapi/structmember.c index 0fb872a4328d60..ab92dda1bc265b 100644 --- a/Modules/_testcapi/structmember.c +++ b/Modules/_testcapi/structmember.c @@ -145,7 +145,7 @@ test_structmembers_free(PyObject *ob) /* Designated initializers would work too, but this does test the *old* API */ static PyTypeObject test_structmembersType_OldAPI= { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "test_structmembersType_OldAPI", sizeof(test_structmembers), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/_testcapi/vectorcall.c b/Modules/_testcapi/vectorcall.c index dcbc973c9fb991..0fa3cf2278dc24 100644 --- a/Modules/_testcapi/vectorcall.c +++ b/Modules/_testcapi/vectorcall.c @@ -315,7 +315,7 @@ call_return_args(PyObject *self, PyObject *args, PyObject *kwargs) } static PyTypeObject MethodDescriptorBase_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethodDescriptorBase", sizeof(MethodDescriptorObject), .tp_new = MethodDescriptor_new, @@ -327,13 +327,13 @@ static PyTypeObject MethodDescriptorBase_Type = { }; static PyTypeObject MethodDescriptorDerived_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethodDescriptorDerived", .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, }; static PyTypeObject MethodDescriptorNopGet_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethodDescriptorNopGet", .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, .tp_call = call_return_args, @@ -355,7 +355,7 @@ MethodDescriptor2_new(PyTypeObject* type, PyObject* args, PyObject *kw) } static PyTypeObject MethodDescriptor2_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethodDescriptor2", sizeof(MethodDescriptor2Object), .tp_new = MethodDescriptor2_new, diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 557a6d46ed4632..fd2ff0402d253d 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -348,7 +348,7 @@ dict_getitem_knownhash(PyObject *self, PyObject *args) * PyType_Ready if it hasn't already been called */ static PyTypeObject _HashInheritanceTester_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "hashinheritancetester", /* Name of this type */ sizeof(PyObject), /* Basic object size */ 0, /* Item size for varobject */ @@ -3623,7 +3623,7 @@ static PyNumberMethods matmulType_as_number = { }; static PyTypeObject matmulType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "matmulType", sizeof(matmulObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -3679,7 +3679,7 @@ static PyNumberMethods ipowType_as_number = { }; static PyTypeObject ipowType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "ipowType", .tp_basicsize = sizeof(ipowObject), .tp_as_number = &ipowType_as_number, @@ -3735,7 +3735,7 @@ static PyAsyncMethods awaitType_as_async = { static PyTypeObject awaitType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "awaitType", sizeof(awaitObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -3806,7 +3806,7 @@ MyList_dealloc(MyListObject* op) } static PyTypeObject MyList_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MyList", sizeof(MyListObject), 0, @@ -3873,7 +3873,7 @@ static PyMethodDef generic_alias_methods[] = { }; static PyTypeObject GenericAlias_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "GenericAlias", sizeof(PyGenericAliasObject), 0, @@ -3909,7 +3909,7 @@ static PyMethodDef generic_methods[] = { }; static PyTypeObject Generic_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "Generic", sizeof(PyGenericObject), 0, @@ -3929,7 +3929,7 @@ static PyMethodDef meth_instance_methods[] = { static PyTypeObject MethInstance_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethInstance", sizeof(PyObject), .tp_new = PyType_GenericNew, @@ -3951,7 +3951,7 @@ static PyMethodDef meth_class_methods[] = { static PyTypeObject MethClass_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethClass", sizeof(PyObject), .tp_new = PyType_GenericNew, @@ -3973,7 +3973,7 @@ static PyMethodDef meth_static_methods[] = { static PyTypeObject MethStatic_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MethStatic", sizeof(PyObject), .tp_new = PyType_GenericNew, @@ -4021,7 +4021,7 @@ static PyMemberDef ContainerNoGC_members[] = { }; static PyTypeObject ContainerNoGC_type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_testcapi.ContainerNoGC", sizeof(ContainerNoGCobject), .tp_dealloc = (destructor)ContainerNoGC_dealloc, diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h index 1b41c231eac5d8..e54dd9d9091e5a 100644 --- a/Modules/cjkcodecs/clinic/multibytecodec.c.h +++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h @@ -39,7 +39,7 @@ _multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(input), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -125,7 +125,7 @@ _multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(input), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -216,7 +216,7 @@ _multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(input), &_Py_ID(final), }, }; #undef NUM_KEYWORDS @@ -345,7 +345,7 @@ _multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(input), &_Py_ID(final), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 43c5d771798634..45873d15929c88 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -40,7 +40,7 @@ _asyncio_Future___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(loop), }, }; #undef NUM_KEYWORDS @@ -250,7 +250,7 @@ _asyncio_Future_add_done_callback(FutureObj *self, PyTypeObject *cls, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(context), }, }; #undef NUM_KEYWORDS @@ -363,7 +363,7 @@ _asyncio_Future_cancel(FutureObj *self, PyTypeObject *cls, PyObject *const *args PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(msg), }, }; #undef NUM_KEYWORDS @@ -503,7 +503,7 @@ _asyncio_Task___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(coro), &_Py_ID(loop), &_Py_ID(name), &_Py_ID(context), }, }; #undef NUM_KEYWORDS @@ -621,7 +621,7 @@ _asyncio_Task_cancel(TaskObj *self, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(msg), }, }; #undef NUM_KEYWORDS @@ -744,7 +744,7 @@ _asyncio_Task_get_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *args, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(limit), }, }; #undef NUM_KEYWORDS @@ -811,7 +811,7 @@ _asyncio_Task_print_stack(TaskObj *self, PyTypeObject *cls, PyObject *const *arg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(limit), &_Py_ID(file), }, }; #undef NUM_KEYWORDS @@ -1033,7 +1033,7 @@ _asyncio__register_task(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(task), }, }; #undef NUM_KEYWORDS @@ -1090,7 +1090,7 @@ _asyncio__unregister_task(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(task), }, }; #undef NUM_KEYWORDS @@ -1149,7 +1149,7 @@ _asyncio__enter_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(loop), &_Py_ID(task), }, }; #undef NUM_KEYWORDS @@ -1210,7 +1210,7 @@ _asyncio__leave_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(loop), &_Py_ID(task), }, }; #undef NUM_KEYWORDS @@ -1267,7 +1267,7 @@ _asyncio_current_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(loop), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_bisectmodule.c.h b/Modules/clinic/_bisectmodule.c.h index 7944f5219b02a3..03aaa9228c61f6 100644 --- a/Modules/clinic/_bisectmodule.c.h +++ b/Modules/clinic/_bisectmodule.c.h @@ -42,7 +42,7 @@ _bisect_bisect_right(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(x), &_Py_ID(lo), &_Py_ID(hi), &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -150,7 +150,7 @@ _bisect_insort_right(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(x), &_Py_ID(lo), &_Py_ID(hi), &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -255,7 +255,7 @@ _bisect_bisect_left(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(x), &_Py_ID(lo), &_Py_ID(hi), &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -363,7 +363,7 @@ _bisect_insort_left(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(x), &_Py_ID(lo), &_Py_ID(hi), &_Py_ID(key), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h index d7797d639ae32e..9e36f7922c7c3a 100644 --- a/Modules/clinic/_bz2module.c.h +++ b/Modules/clinic/_bz2module.c.h @@ -151,7 +151,7 @@ _bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *const *args, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(max_length), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h index f11bcc8815b920..bec9ba865773bb 100644 --- a/Modules/clinic/_codecsmodule.c.h +++ b/Modules/clinic/_codecsmodule.c.h @@ -100,7 +100,7 @@ _codecs_encode(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(obj), &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -200,7 +200,7 @@ _codecs_decode(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(obj), &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_csv.c.h b/Modules/clinic/_csv.c.h index 8900946350a524..a8f31105e9067a 100644 --- a/Modules/clinic/_csv.c.h +++ b/Modules/clinic/_csv.c.h @@ -54,7 +54,7 @@ _csv_unregister_dialect(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -111,7 +111,7 @@ _csv_get_dialect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -171,7 +171,7 @@ _csv_field_size_limit(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(new_limit), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h index 9d99d41af5d2d9..0aca22bd6d49a7 100644 --- a/Modules/clinic/_cursesmodule.c.h +++ b/Modules/clinic/_cursesmodule.c.h @@ -2692,7 +2692,7 @@ _curses_setupterm(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(term), &_Py_ID(fd), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_datetimemodule.c.h b/Modules/clinic/_datetimemodule.c.h index 51e51e3791cc24..40b393fe232c8a 100644 --- a/Modules/clinic/_datetimemodule.c.h +++ b/Modules/clinic/_datetimemodule.c.h @@ -36,7 +36,7 @@ iso_calendar_date_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(year), &_Py_ID(week), &_Py_ID(weekday), }, }; #undef NUM_KEYWORDS @@ -111,7 +111,7 @@ datetime_datetime_now(PyTypeObject *type, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(tz), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h index a0bc751ca21ee8..07e92574a0be69 100644 --- a/Modules/clinic/_elementtree.c.h +++ b/Modules/clinic/_elementtree.c.h @@ -275,7 +275,7 @@ _elementtree_Element_find(ElementObject *self, PyTypeObject *cls, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(namespaces), }, }; #undef NUM_KEYWORDS @@ -338,7 +338,7 @@ _elementtree_Element_findtext(ElementObject *self, PyTypeObject *cls, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(default), &_Py_ID(namespaces), }, }; #undef NUM_KEYWORDS @@ -407,7 +407,7 @@ _elementtree_Element_findall(ElementObject *self, PyTypeObject *cls, PyObject *c PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(namespaces), }, }; #undef NUM_KEYWORDS @@ -469,7 +469,7 @@ _elementtree_Element_iterfind(ElementObject *self, PyTypeObject *cls, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(namespaces), }, }; #undef NUM_KEYWORDS @@ -531,7 +531,7 @@ _elementtree_Element_get(ElementObject *self, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(default), }, }; #undef NUM_KEYWORDS @@ -593,7 +593,7 @@ _elementtree_Element_iter(ElementObject *self, PyTypeObject *cls, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(tag), }, }; #undef NUM_KEYWORDS @@ -855,7 +855,7 @@ _elementtree_TreeBuilder___init__(PyObject *self, PyObject *args, PyObject *kwar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(element_factory), &_Py_ID(comment_factory), &_Py_ID(pi_factory), &_Py_ID(insert_comments), &_Py_ID(insert_pis), }, }; #undef NUM_KEYWORDS @@ -1089,7 +1089,7 @@ _elementtree_XMLParser___init__(PyObject *self, PyObject *args, PyObject *kwargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(target), &_Py_ID(encoding), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h index 9c79e6430413bf..d07398862018df 100644 --- a/Modules/clinic/_functoolsmodule.c.h +++ b/Modules/clinic/_functoolsmodule.c.h @@ -35,7 +35,7 @@ _functools_cmp_to_key(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(mycmp), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index fb61a444018dbb..117e13cea4249c 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -97,7 +97,7 @@ EVPXOF_digest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(length), }, }; #undef NUM_KEYWORDS @@ -167,7 +167,7 @@ EVPXOF_hexdigest(EVPobject *self, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(length), }, }; #undef NUM_KEYWORDS @@ -241,7 +241,7 @@ EVP_new(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -318,7 +318,7 @@ _hashlib_openssl_md5(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -393,7 +393,7 @@ _hashlib_openssl_sha1(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -468,7 +468,7 @@ _hashlib_openssl_sha224(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -543,7 +543,7 @@ _hashlib_openssl_sha256(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -618,7 +618,7 @@ _hashlib_openssl_sha384(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -693,7 +693,7 @@ _hashlib_openssl_sha512(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -770,7 +770,7 @@ _hashlib_openssl_sha3_224(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -849,7 +849,7 @@ _hashlib_openssl_sha3_256(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -928,7 +928,7 @@ _hashlib_openssl_sha3_384(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -1007,7 +1007,7 @@ _hashlib_openssl_sha3_512(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -1086,7 +1086,7 @@ _hashlib_openssl_shake_128(PyObject *module, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -1165,7 +1165,7 @@ _hashlib_openssl_shake_256(PyObject *module, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -1244,7 +1244,7 @@ pbkdf2_hmac(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(hash_name), &_Py_ID(password), &_Py_ID(salt), &_Py_ID(iterations), &_Py_ID(dklen), }, }; #undef NUM_KEYWORDS @@ -1353,7 +1353,7 @@ _hashlib_scrypt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(password), &_Py_ID(salt), &_Py_ID(n), &_Py_ID(r), &_Py_ID(p), &_Py_ID(maxmem), &_Py_ID(dklen), }, }; #undef NUM_KEYWORDS @@ -1492,7 +1492,7 @@ _hashlib_hmac_singleshot(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(msg), &_Py_ID(digest), }, }; #undef NUM_KEYWORDS @@ -1573,7 +1573,7 @@ _hashlib_hmac_new(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(msg), &_Py_ID(digestmod), }, }; #undef NUM_KEYWORDS @@ -1671,7 +1671,7 @@ _hashlib_HMAC_update(HMACobject *self, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(msg), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h index 9b396a56683921..453183d5cfd531 100644 --- a/Modules/clinic/_lzmamodule.c.h +++ b/Modules/clinic/_lzmamodule.c.h @@ -109,7 +109,7 @@ _lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(max_length), }, }; #undef NUM_KEYWORDS @@ -208,7 +208,7 @@ _lzma_LZMADecompressor(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(format), &_Py_ID(memlimit), &_Py_ID(filters), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h index 3bd3ba02387435..33fcef73191500 100644 --- a/Modules/clinic/_opcode.c.h +++ b/Modules/clinic/_opcode.c.h @@ -33,7 +33,7 @@ _opcode_stack_effect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(jump), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h index 539acc34a05cc1..d937982eec5cb8 100644 --- a/Modules/clinic/_pickle.c.h +++ b/Modules/clinic/_pickle.c.h @@ -155,7 +155,7 @@ _pickle_Pickler___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(protocol), &_Py_ID(fix_imports), &_Py_ID(buffer_callback), }, }; #undef NUM_KEYWORDS @@ -417,7 +417,7 @@ _pickle_Unpickler___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(fix_imports), &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(buffers), }, }; #undef NUM_KEYWORDS @@ -611,7 +611,7 @@ _pickle_dump(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(obj), &_Py_ID(file), &_Py_ID(protocol), &_Py_ID(fix_imports), &_Py_ID(buffer_callback), }, }; #undef NUM_KEYWORDS @@ -715,7 +715,7 @@ _pickle_dumps(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(obj), &_Py_ID(protocol), &_Py_ID(fix_imports), &_Py_ID(buffer_callback), }, }; #undef NUM_KEYWORDS @@ -823,7 +823,7 @@ _pickle_load(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(fix_imports), &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(buffers), }, }; #undef NUM_KEYWORDS @@ -949,7 +949,7 @@ _pickle_loads(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fix_imports), &_Py_ID(encoding), &_Py_ID(errors), &_Py_ID(buffers), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_queuemodule.c.h b/Modules/clinic/_queuemodule.c.h index 94fb59a5b17a49..6a10b01f7fa369 100644 --- a/Modules/clinic/_queuemodule.c.h +++ b/Modules/clinic/_queuemodule.c.h @@ -65,7 +65,7 @@ _queue_SimpleQueue_put(simplequeueobject *self, PyObject *const *args, Py_ssize_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(item), &_Py_ID(block), &_Py_ID(timeout), }, }; #undef NUM_KEYWORDS @@ -140,7 +140,7 @@ _queue_SimpleQueue_put_nowait(simplequeueobject *self, PyObject *const *args, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(item), }, }; #undef NUM_KEYWORDS @@ -204,7 +204,7 @@ _queue_SimpleQueue_get(simplequeueobject *self, PyTypeObject *cls, PyObject *con PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(block), &_Py_ID(timeout), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 9f967ddc8e3061..2d43906be14823 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -362,7 +362,7 @@ _ssl__SSLSocket_get_channel_binding(PySSLSocket *self, PyObject *const *args, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(cb_type), }, }; #undef NUM_KEYWORDS @@ -568,7 +568,7 @@ _ssl__SSLContext_load_cert_chain(PySSLContext *self, PyObject *const *args, Py_s PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(certfile), &_Py_ID(keyfile), &_Py_ID(password), }, }; #undef NUM_KEYWORDS @@ -639,7 +639,7 @@ _ssl__SSLContext_load_verify_locations(PySSLContext *self, PyObject *const *args PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(cafile), &_Py_ID(capath), &_Py_ID(cadata), }, }; #undef NUM_KEYWORDS @@ -723,7 +723,7 @@ _ssl__SSLContext__wrap_socket(PySSLContext *self, PyObject *const *args, Py_ssiz PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sock), &_Py_ID(server_side), &_Py_ID(server_hostname), &_Py_ID(owner), &_Py_ID(session), }, }; #undef NUM_KEYWORDS @@ -815,7 +815,7 @@ _ssl__SSLContext__wrap_bio(PySSLContext *self, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(incoming), &_Py_ID(outgoing), &_Py_ID(server_side), &_Py_ID(server_hostname), &_Py_ID(owner), &_Py_ID(session), }, }; #undef NUM_KEYWORDS @@ -982,7 +982,7 @@ _ssl__SSLContext_get_ca_certs(PySSLContext *self, PyObject *const *args, Py_ssiz PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(binary_form), }, }; #undef NUM_KEYWORDS @@ -1301,7 +1301,7 @@ _ssl_txt2obj(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(txt), &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -1414,7 +1414,7 @@ _ssl_enum_certificates(PyObject *module, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(store_name), }, }; #undef NUM_KEYWORDS @@ -1490,7 +1490,7 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(store_name), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h index c3cf179ed4c040..f51c12dd5a3e10 100644 --- a/Modules/clinic/_struct.c.h +++ b/Modules/clinic/_struct.c.h @@ -34,7 +34,7 @@ Struct(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(format), }, }; #undef NUM_KEYWORDS @@ -140,7 +140,7 @@ Struct_unpack_from(PyStructObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(buffer), &_Py_ID(offset), }, }; #undef NUM_KEYWORDS @@ -345,7 +345,7 @@ unpack_from(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(buffer), &_Py_ID(offset), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index 831f58ca650aab..979bd990ae937f 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -1262,7 +1262,7 @@ keywords(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -1318,7 +1318,7 @@ keywords_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -1374,7 +1374,7 @@ keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -1443,7 +1443,7 @@ keywords_opt_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -1523,7 +1523,7 @@ keywords_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -1591,7 +1591,7 @@ posonly_keywords(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -1647,7 +1647,7 @@ posonly_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -1704,7 +1704,7 @@ posonly_keywords_kwonly(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), }, }; #undef NUM_KEYWORDS @@ -1763,7 +1763,7 @@ posonly_keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -1834,7 +1834,7 @@ posonly_opt_keywords_opt(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -1910,7 +1910,7 @@ posonly_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -1981,7 +1981,7 @@ posonly_opt_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2057,7 +2057,7 @@ posonly_keywords_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), }, }; #undef NUM_KEYWORDS @@ -2132,7 +2132,7 @@ posonly_keywords_opt_kwonly_opt(PyObject *module, PyObject *const *args, Py_ssiz PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), &_Py_ID(c), &_Py_ID(d), &_Py_ID(e), }, }; #undef NUM_KEYWORDS @@ -2216,7 +2216,7 @@ posonly_opt_keywords_opt_kwonly_opt(PyObject *module, PyObject *const *args, Py_ PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(c), &_Py_ID(d), }, }; #undef NUM_KEYWORDS @@ -2295,7 +2295,7 @@ keyword_only_parameter(PyObject *module, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), }, }; #undef NUM_KEYWORDS @@ -2350,7 +2350,7 @@ posonly_vararg(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -2445,7 +2445,7 @@ vararg(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwna PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), }, }; #undef NUM_KEYWORDS @@ -2503,7 +2503,7 @@ vararg_with_default(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -2570,7 +2570,7 @@ vararg_with_only_defaults(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(b), }, }; #undef NUM_KEYWORDS @@ -2634,7 +2634,7 @@ gh_32092_oob(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pos1), &_Py_ID(pos2), &_Py_ID(kw1), &_Py_ID(kw2), }, }; #undef NUM_KEYWORDS @@ -2709,7 +2709,7 @@ gh_32092_kw_pass(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pos), &_Py_ID(kw), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_testinternalcapi.c.h b/Modules/clinic/_testinternalcapi.c.h index e8d5681b194916..743b86d1aef7f1 100644 --- a/Modules/clinic/_testinternalcapi.c.h +++ b/Modules/clinic/_testinternalcapi.c.h @@ -33,7 +33,7 @@ _testinternalcapi_compiler_codegen(PyObject *module, PyObject *const *args, Py_s PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(ast), &_Py_ID(filename), &_Py_ID(optimize), }, }; #undef NUM_KEYWORDS @@ -96,7 +96,7 @@ _testinternalcapi_optimize_cfg(PyObject *module, PyObject *const *args, Py_ssize PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(instructions), &_Py_ID(consts), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_testmultiphase.c.h b/Modules/clinic/_testmultiphase.c.h index 42ec7475e5e4be..50577497714a1c 100644 --- a/Modules/clinic/_testmultiphase.c.h +++ b/Modules/clinic/_testmultiphase.c.h @@ -87,7 +87,7 @@ _testmultiphase_StateAccessType_increment_count_clinic(StateAccessTypeObject *se PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(n), &_Py_ID(twice), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h index 7bc63e612be348..1880a55f9314c8 100644 --- a/Modules/clinic/_winapi.c.h +++ b/Modules/clinic/_winapi.c.h @@ -120,7 +120,7 @@ _winapi_ConnectNamedPipe(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(handle), &_Py_ID(overlapped), }, }; #undef NUM_KEYWORDS @@ -899,7 +899,7 @@ _winapi_LCMapStringEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(locale), &_Py_ID(flags), &_Py_ID(src), }, }; #undef NUM_KEYWORDS @@ -959,7 +959,7 @@ _winapi_ReadFile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(handle), &_Py_ID(size), &_Py_ID(overlapped), }, }; #undef NUM_KEYWORDS @@ -1207,7 +1207,7 @@ _winapi_WriteFile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(handle), &_Py_ID(buffer), &_Py_ID(overlapped), }, }; #undef NUM_KEYWORDS @@ -1279,7 +1279,7 @@ _winapi_GetFileType(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(handle), }, }; #undef NUM_KEYWORDS @@ -1341,7 +1341,7 @@ _winapi__mimetypes_read_windows_registry(PyObject *module, PyObject *const *args PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(on_type_read), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/_zoneinfo.c.h b/Modules/clinic/_zoneinfo.c.h index ae62865e0f67df..24ba71b316f162 100644 --- a/Modules/clinic/_zoneinfo.c.h +++ b/Modules/clinic/_zoneinfo.c.h @@ -33,7 +33,7 @@ zoneinfo_ZoneInfo_from_file(PyTypeObject *type, PyTypeObject *cls, PyObject *con PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -96,7 +96,7 @@ zoneinfo_ZoneInfo_no_cache(PyTypeObject *type, PyTypeObject *cls, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -152,7 +152,7 @@ zoneinfo_ZoneInfo_clear_cache(PyTypeObject *type, PyTypeObject *cls, PyObject *c PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(only_keys), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h index 63566dfb10e74f..2c60378ddca118 100644 --- a/Modules/clinic/binascii.c.h +++ b/Modules/clinic/binascii.c.h @@ -63,7 +63,7 @@ binascii_b2a_uu(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(backtick), }, }; #undef NUM_KEYWORDS @@ -143,7 +143,7 @@ binascii_a2b_base64(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(strict_mode), }, }; #undef NUM_KEYWORDS @@ -214,7 +214,7 @@ binascii_b2a_base64(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(newline), }, }; #undef NUM_KEYWORDS @@ -405,7 +405,7 @@ binascii_b2a_hex(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(sep), &_Py_ID(bytes_per_sep), }, }; #undef NUM_KEYWORDS @@ -498,7 +498,7 @@ binascii_hexlify(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(sep), &_Py_ID(bytes_per_sep), }, }; #undef NUM_KEYWORDS @@ -648,7 +648,7 @@ binascii_a2b_qp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(header), }, }; #undef NUM_KEYWORDS @@ -724,7 +724,7 @@ binascii_b2a_qp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(quotetabs), &_Py_ID(istext), &_Py_ID(header), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h index 941448e76e80de..29ec5dd1c3b028 100644 --- a/Modules/clinic/cmathmodule.c.h +++ b/Modules/clinic/cmathmodule.c.h @@ -907,7 +907,7 @@ cmath_isclose(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(rel_tol), &_Py_ID(abs_tol), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h index 2d18e2ee0978e0..cf09c88c82be32 100644 --- a/Modules/clinic/gcmodule.c.h +++ b/Modules/clinic/gcmodule.c.h @@ -102,7 +102,7 @@ gc_collect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(generation), }, }; #undef NUM_KEYWORDS @@ -279,7 +279,7 @@ gc_get_objects(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(generation), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/grpmodule.c.h b/Modules/clinic/grpmodule.c.h index 4914bc9abd67b5..86519d932e0db0 100644 --- a/Modules/clinic/grpmodule.c.h +++ b/Modules/clinic/grpmodule.c.h @@ -34,7 +34,7 @@ grp_getgrgid(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(id), }, }; #undef NUM_KEYWORDS @@ -91,7 +91,7 @@ grp_getgrnam(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/itertoolsmodule.c.h b/Modules/clinic/itertoolsmodule.c.h index 32278bf715aa98..44b7ff56ef65de 100644 --- a/Modules/clinic/itertoolsmodule.c.h +++ b/Modules/clinic/itertoolsmodule.c.h @@ -41,7 +41,7 @@ batched_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(n), }, }; #undef NUM_KEYWORDS @@ -147,7 +147,7 @@ itertools_groupby(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(key), }, }; #undef NUM_KEYWORDS @@ -493,7 +493,7 @@ itertools_combinations(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(r), }, }; #undef NUM_KEYWORDS @@ -564,7 +564,7 @@ itertools_combinations_with_replacement(PyTypeObject *type, PyObject *args, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(r), }, }; #undef NUM_KEYWORDS @@ -634,7 +634,7 @@ itertools_permutations(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(r), }, }; #undef NUM_KEYWORDS @@ -696,7 +696,7 @@ itertools_accumulate(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(func), &_Py_ID(initial), }, }; #undef NUM_KEYWORDS @@ -771,7 +771,7 @@ itertools_compress(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(selectors), }, }; #undef NUM_KEYWORDS @@ -869,7 +869,7 @@ itertools_count(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(start), &_Py_ID(step), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/mathmodule.c.h b/Modules/clinic/mathmodule.c.h index bc5bbceb4c92b6..7021233ab87bef 100644 --- a/Modules/clinic/mathmodule.c.h +++ b/Modules/clinic/mathmodule.c.h @@ -586,7 +586,7 @@ math_isclose(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(rel_tol), &_Py_ID(abs_tol), }, }; #undef NUM_KEYWORDS @@ -704,7 +704,7 @@ math_prod(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(start), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h index b4602104f18042..33c56f1adee473 100644 --- a/Modules/clinic/md5module.c.h +++ b/Modules/clinic/md5module.c.h @@ -99,7 +99,7 @@ _md5_md5(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h index 9d9f2cbf6afdc2..c888f7915331e6 100644 --- a/Modules/clinic/overlapped.c.h +++ b/Modules/clinic/overlapped.c.h @@ -460,7 +460,7 @@ _overlapped_Overlapped(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(event), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index 8b0550d832fc0a..3e5aaab38b158b 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -51,7 +51,7 @@ os_stat(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -133,7 +133,7 @@ os_lstat(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -229,7 +229,7 @@ os_access(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), &_Py_ID(dir_fd), &_Py_ID(effective_ids), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -389,7 +389,7 @@ os_chdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -454,7 +454,7 @@ os_fchdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -537,7 +537,7 @@ os_chmod(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), &_Py_ID(dir_fd), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -633,7 +633,7 @@ os_fchmod(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(mode), }, }; #undef NUM_KEYWORDS @@ -703,7 +703,7 @@ os_lchmod(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), }, }; #undef NUM_KEYWORDS @@ -779,7 +779,7 @@ os_chflags(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(flags), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -862,7 +862,7 @@ os_lchflags(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -932,7 +932,7 @@ os_chroot(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -996,7 +996,7 @@ os_fsync(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -1079,7 +1079,7 @@ os_fdatasync(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -1165,7 +1165,7 @@ os_chown(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(uid), &_Py_ID(gid), &_Py_ID(dir_fd), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -1258,7 +1258,7 @@ os_fchown(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(uid), &_Py_ID(gid), }, }; #undef NUM_KEYWORDS @@ -1331,7 +1331,7 @@ os_lchown(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(uid), &_Py_ID(gid), }, }; #undef NUM_KEYWORDS @@ -1451,7 +1451,7 @@ os_link(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(src_dir_fd), &_Py_ID(dst_dir_fd), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -1558,7 +1558,7 @@ os_listdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -1675,7 +1675,7 @@ os_listmounts(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(volume), }, }; #undef NUM_KEYWORDS @@ -1806,7 +1806,7 @@ os__getvolumepathname(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -1870,7 +1870,7 @@ os__path_splitroot(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -1934,7 +1934,7 @@ os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -1993,7 +1993,7 @@ os__path_isfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -2052,7 +2052,7 @@ os__path_exists(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -2111,7 +2111,7 @@ os__path_islink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -2168,7 +2168,7 @@ os__path_normpath(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyO PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -2231,7 +2231,7 @@ os_mkdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -2348,7 +2348,7 @@ os_getpriority(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(which), &_Py_ID(who), }, }; #undef NUM_KEYWORDS @@ -2415,7 +2415,7 @@ os_setpriority(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(which), &_Py_ID(who), &_Py_ID(priority), }, }; #undef NUM_KEYWORDS @@ -2492,7 +2492,7 @@ os_rename(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(src_dir_fd), &_Py_ID(dst_dir_fd), }, }; #undef NUM_KEYWORDS @@ -2583,7 +2583,7 @@ os_replace(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(src_dir_fd), &_Py_ID(dst_dir_fd), }, }; #undef NUM_KEYWORDS @@ -2672,7 +2672,7 @@ os_rmdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -2743,7 +2743,7 @@ os_system(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(command), }, }; #undef NUM_KEYWORDS @@ -2817,7 +2817,7 @@ os_system(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(command), }, }; #undef NUM_KEYWORDS @@ -2921,7 +2921,7 @@ os_unlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -2995,7 +2995,7 @@ os_remove(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -3113,7 +3113,7 @@ os_utime(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(times), &_Py_ID(ns), &_Py_ID(dir_fd), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -3210,7 +3210,7 @@ os__exit(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -3321,7 +3321,7 @@ os_execve(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(argv), &_Py_ID(env), }, }; #undef NUM_KEYWORDS @@ -3416,7 +3416,7 @@ os_posix_spawn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file_actions), &_Py_ID(setpgroup), &_Py_ID(resetids), &_Py_ID(setsid), &_Py_ID(setsigmask), &_Py_ID(setsigdef), &_Py_ID(scheduler), }, }; #undef NUM_KEYWORDS @@ -3566,7 +3566,7 @@ os_posix_spawnp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file_actions), &_Py_ID(setpgroup), &_Py_ID(resetids), &_Py_ID(setsid), &_Py_ID(setsigmask), &_Py_ID(setsigdef), &_Py_ID(scheduler), }, }; #undef NUM_KEYWORDS @@ -3809,7 +3809,7 @@ os_register_at_fork(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(before), &_Py_ID(after_in_child), &_Py_ID(after_in_parent), }, }; #undef NUM_KEYWORDS @@ -3935,7 +3935,7 @@ os_sched_get_priority_max(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(policy), }, }; #undef NUM_KEYWORDS @@ -3997,7 +3997,7 @@ os_sched_get_priority_min(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(policy), }, }; #undef NUM_KEYWORDS @@ -4092,7 +4092,7 @@ os_sched_param(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sched_priority), }, }; #undef NUM_KEYWORDS @@ -4784,7 +4784,7 @@ os_getpgid(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pid), }, }; #undef NUM_KEYWORDS @@ -5268,7 +5268,7 @@ os_wait3(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(options), }, }; #undef NUM_KEYWORDS @@ -5333,7 +5333,7 @@ os_wait4(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pid), &_Py_ID(options), }, }; #undef NUM_KEYWORDS @@ -5540,7 +5540,7 @@ os_pidfd_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(pid), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -5603,7 +5603,7 @@ os_setns(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(nstype), }, }; #undef NUM_KEYWORDS @@ -5677,7 +5677,7 @@ os_unshare(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -5745,7 +5745,7 @@ os_readlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -5829,7 +5829,7 @@ os_symlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(target_is_directory), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -6102,7 +6102,7 @@ os_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(flags), &_Py_ID(mode), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -6195,7 +6195,7 @@ os_close(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -6324,7 +6324,7 @@ os_dup2(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(fd2), &_Py_ID(inheritable), }, }; #undef NUM_KEYWORDS @@ -6776,7 +6776,7 @@ os_sendfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(out_fd), &_Py_ID(in_fd), &_Py_ID(offset), &_Py_ID(count), &_Py_ID(headers), &_Py_ID(trailers), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -6878,7 +6878,7 @@ os_sendfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(out_fd), &_Py_ID(in_fd), &_Py_ID(offset), &_Py_ID(count), &_Py_ID(headers), &_Py_ID(trailers), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -6987,7 +6987,7 @@ os_sendfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(out_fd), &_Py_ID(in_fd), &_Py_ID(offset), &_Py_ID(count), }, }; #undef NUM_KEYWORDS @@ -7115,7 +7115,7 @@ os_fstat(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -7467,7 +7467,7 @@ os_copy_file_range(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(count), &_Py_ID(offset_src), &_Py_ID(offset_dst), }, }; #undef NUM_KEYWORDS @@ -7581,7 +7581,7 @@ os_splice(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(src), &_Py_ID(dst), &_Py_ID(count), &_Py_ID(offset_src), &_Py_ID(offset_dst), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -7689,7 +7689,7 @@ os_mkfifo(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -7789,7 +7789,7 @@ os_mknod(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(mode), &_Py_ID(device), &_Py_ID(dir_fd), }, }; #undef NUM_KEYWORDS @@ -8044,7 +8044,7 @@ os_truncate(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(length), }, }; #undef NUM_KEYWORDS @@ -8445,7 +8445,7 @@ os_WIFCONTINUED(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8512,7 +8512,7 @@ os_WIFSTOPPED(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8579,7 +8579,7 @@ os_WIFSIGNALED(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8646,7 +8646,7 @@ os_WIFEXITED(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8713,7 +8713,7 @@ os_WEXITSTATUS(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8780,7 +8780,7 @@ os_WTERMSIG(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8847,7 +8847,7 @@ os_WSTOPSIG(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS @@ -8952,7 +8952,7 @@ os_statvfs(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -9016,7 +9016,7 @@ os__getdiskusage(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -9129,7 +9129,7 @@ os_pathconf(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(name), }, }; #undef NUM_KEYWORDS @@ -9318,7 +9318,7 @@ os_startfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(filepath), &_Py_ID(operation), &_Py_ID(arguments), &_Py_ID(cwd), &_Py_ID(show_cmd), }, }; #undef NUM_KEYWORDS @@ -9462,7 +9462,7 @@ os_device_encoding(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -9656,7 +9656,7 @@ os_getxattr(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(attribute), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -9743,7 +9743,7 @@ os_setxattr(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(attribute), &_Py_ID(value), &_Py_ID(flags), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -9855,7 +9855,7 @@ os_removexattr(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(attribute), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -9941,7 +9941,7 @@ os_listxattr(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -10059,7 +10059,7 @@ os_memfd_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -10133,7 +10133,7 @@ os_eventfd(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(initval), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -10204,7 +10204,7 @@ os_eventfd_read(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -10265,7 +10265,7 @@ os_eventfd_write(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(value), }, }; #undef NUM_KEYWORDS @@ -10679,7 +10679,7 @@ os_DirEntry_stat(DirEntry *self, PyTypeObject *defining_class, PyObject *const * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -10743,7 +10743,7 @@ os_DirEntry_is_dir(DirEntry *self, PyTypeObject *defining_class, PyObject *const PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -10812,7 +10812,7 @@ os_DirEntry_is_file(DirEntry *self, PyTypeObject *defining_class, PyObject *cons PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(follow_symlinks), }, }; #undef NUM_KEYWORDS @@ -10922,7 +10922,7 @@ os_scandir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -10991,7 +10991,7 @@ os_fspath(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -11048,7 +11048,7 @@ os_getrandom(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(size), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -11135,7 +11135,7 @@ os__add_dll_directory(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(path), }, }; #undef NUM_KEYWORDS @@ -11203,7 +11203,7 @@ os__remove_dll_directory(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(cookie), }, }; #undef NUM_KEYWORDS @@ -11274,7 +11274,7 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(status), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h index 34937c5d594f5c..81feff311c41f5 100644 --- a/Modules/clinic/pyexpat.c.h +++ b/Modules/clinic/pyexpat.c.h @@ -383,7 +383,7 @@ pyexpat_ParserCreate(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(encoding), &_Py_ID(namespace_separator), &_Py_ID(intern), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/selectmodule.c.h b/Modules/clinic/selectmodule.c.h index f44ca1d70a1e86..4c44d21abebb58 100644 --- a/Modules/clinic/selectmodule.c.h +++ b/Modules/clinic/selectmodule.c.h @@ -536,7 +536,7 @@ select_epoll(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sizehint), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -702,7 +702,7 @@ select_epoll_register(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(eventmask), }, }; #undef NUM_KEYWORDS @@ -779,7 +779,7 @@ select_epoll_modify(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), &_Py_ID(eventmask), }, }; #undef NUM_KEYWORDS @@ -848,7 +848,7 @@ select_epoll_unregister(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fd), }, }; #undef NUM_KEYWORDS @@ -919,7 +919,7 @@ select_epoll_poll(pyEpoll_Object *self, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(timeout), &_Py_ID(maxevents), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h index ad15ddaadfc86c..7cbb4b5957c545 100644 --- a/Modules/clinic/sha1module.c.h +++ b/Modules/clinic/sha1module.c.h @@ -99,7 +99,7 @@ _sha1_sha1(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/sha2module.c.h b/Modules/clinic/sha2module.c.h index 8f855ca345e47a..01bbf9e31136b0 100644 --- a/Modules/clinic/sha2module.c.h +++ b/Modules/clinic/sha2module.c.h @@ -166,7 +166,7 @@ _sha2_sha256(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -240,7 +240,7 @@ _sha2_sha224(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -314,7 +314,7 @@ _sha2_sha512(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS @@ -388,7 +388,7 @@ _sha2_sha384(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(string), &_Py_ID(usedforsecurity), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h index 8ff1044d013b0f..6ec4f0e2ee4bb0 100644 --- a/Modules/clinic/socketmodule.c.h +++ b/Modules/clinic/socketmodule.c.h @@ -24,7 +24,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(family), &_Py_ID(type), &_Py_ID(proto), &_Py_ID(fileno), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/syslogmodule.c.h b/Modules/clinic/syslogmodule.c.h index 0ce66ad4e1a490..0fd41a15444b2f 100644 --- a/Modules/clinic/syslogmodule.c.h +++ b/Modules/clinic/syslogmodule.c.h @@ -34,7 +34,7 @@ syslog_openlog(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(ident), &_Py_ID(logoption), &_Py_ID(facility), }, }; #undef NUM_KEYWORDS diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h index 65412b2435ade1..b3f7e4ad877383 100644 --- a/Modules/clinic/zlibmodule.c.h +++ b/Modules/clinic/zlibmodule.c.h @@ -39,7 +39,7 @@ zlib_compress(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(level), &_Py_ID(wbits), }, }; #undef NUM_KEYWORDS @@ -133,7 +133,7 @@ zlib_decompress(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(wbits), &_Py_ID(bufsize), }, }; #undef NUM_KEYWORDS @@ -252,7 +252,7 @@ zlib_compressobj(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(level), &_Py_ID(method), &_Py_ID(wbits), &_Py_ID(memLevel), &_Py_ID(strategy), &_Py_ID(zdict), }, }; #undef NUM_KEYWORDS @@ -379,7 +379,7 @@ zlib_decompressobj(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(wbits), &_Py_ID(zdict), }, }; #undef NUM_KEYWORDS @@ -523,7 +523,7 @@ zlib_Decompress_decompress(compobject *self, PyTypeObject *cls, PyObject *const PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(max_length), }, }; #undef NUM_KEYWORDS @@ -935,7 +935,7 @@ zlib_ZlibDecompressor_decompress(ZlibDecompressor *self, PyObject *const *args, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(data), &_Py_ID(max_length), }, }; #undef NUM_KEYWORDS diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 2319eac449eb4f..35dfc50a9fccc6 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -960,7 +960,7 @@ static PyGetSetDef oss_getsetlist[] = { }; static PyTypeObject OSSAudioType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "ossaudiodev.oss_audio_device", /*tp_name*/ sizeof(oss_audio_t), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -994,7 +994,7 @@ static PyTypeObject OSSAudioType = { }; static PyTypeObject OSSMixerType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "ossaudiodev.oss_mixer_device", /*tp_name*/ sizeof(oss_mixer_t), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index c2b8283d84e5f8..cbbf96cac2012d 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -5512,7 +5512,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto, /* Type object for socket objects. */ static PyTypeObject sock_type = { - PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */ + _PyVarObject_HEAD_IMMORTAL_INIT(0, 0) /* Must fill in type value later */ "_socket.socket", /* tp_name */ sizeof(PySocketSockObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c index a676fdb4ec773a..515927010100df 100644 --- a/Modules/xxmodule.c +++ b/Modules/xxmodule.c @@ -98,7 +98,7 @@ Xxo_setattr(XxoObject *self, const char *name, PyObject *v) static PyTypeObject Xxo_Type = { /* The ob_type field must be initialized in the module init function * to be portable to Windows without using C++. */ - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "xxmodule.Xxo", /*tp_name*/ sizeof(XxoObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -214,7 +214,7 @@ xx_roj(PyObject *self, PyObject *args) static PyTypeObject Str_Type = { /* The ob_type field must be initialized in the module init function * to be portable to Windows without using C++. */ - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "xxmodule.Str", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -268,7 +268,7 @@ null_richcompare(PyObject *self, PyObject *other, int op) static PyTypeObject Null_Type = { /* The ob_type field must be initialized in the module init function * to be portable to Windows without using C++. */ - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "xxmodule.Null", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c index 8512baf7cd0a2d..9dc93bbc75e341 100644 --- a/Modules/xxsubtype.c +++ b/Modules/xxsubtype.c @@ -97,7 +97,7 @@ static PyGetSetDef spamlist_getsets[] = { }; static PyTypeObject spamlist_type = { - PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + _PyVarObject_HEAD_IMMORTAL_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "xxsubtype.spamlist", sizeof(spamlistobject), 0, @@ -187,7 +187,7 @@ static PyMemberDef spamdict_members[] = { }; static PyTypeObject spamdict_type = { - PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + _PyVarObject_HEAD_IMMORTAL_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "xxsubtype.spamdict", sizeof(spamdictobject), 0, diff --git a/Objects/boolobject.c b/Objects/boolobject.c index 9d8e956e06f712..15082d2acdb068 100644 --- a/Objects/boolobject.c +++ b/Objects/boolobject.c @@ -154,7 +154,7 @@ bool_dealloc(PyObject* Py_UNUSED(ignore)) /* The type object for bool. Note that this cannot be subclassed! */ PyTypeObject PyBool_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "bool", offsetof(struct _longobject, long_value.ob_digit), /* tp_basicsize */ sizeof(digit), /* tp_itemsize */ diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 49d4dd524696a5..dfc896fc3e03f9 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2286,7 +2286,7 @@ Construct a mutable bytearray object from:\n\ static PyObject *bytearray_iter(PyObject *seq); PyTypeObject PyByteArray_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "bytearray", sizeof(PyByteArrayObject), 0, @@ -2433,7 +2433,7 @@ static PyMethodDef bytearrayiter_methods[] = { }; PyTypeObject PyByteArrayIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "bytearray_iterator", /* tp_name */ sizeof(bytesiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 2d8dab6f378006..c4e43d00791324 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2917,7 +2917,7 @@ Construct an immutable array of bytes from:\n\ static PyObject *bytes_iter(PyObject *seq); PyTypeObject PyBytes_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "bytes", PyBytesObject_SIZE, sizeof(char), @@ -3212,7 +3212,7 @@ static PyMethodDef striter_methods[] = { }; PyTypeObject PyBytesIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "bytes_iterator", /* tp_name */ sizeof(striterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/capsule.c b/Objects/capsule.c index baaddb3f1f0849..dedfe3c8e8e3f4 100644 --- a/Objects/capsule.c +++ b/Objects/capsule.c @@ -292,7 +292,7 @@ Python import mechanism to link to one another.\n\ "); PyTypeObject PyCapsule_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "PyCapsule", /*tp_name*/ sizeof(PyCapsule), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/Objects/cellobject.c b/Objects/cellobject.c index f516707f6f8086..f2928072d17182 100644 --- a/Objects/cellobject.c +++ b/Objects/cellobject.c @@ -150,7 +150,7 @@ static PyGetSetDef cell_getsetlist[] = { }; PyTypeObject PyCell_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "cell", sizeof(PyCellObject), 0, diff --git a/Objects/classobject.c b/Objects/classobject.c index 2cb192e725d40d..a725f960c9740e 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -317,7 +317,7 @@ method_traverse(PyMethodObject *im, visitproc visit, void *arg) } PyTypeObject PyMethod_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "method", .tp_basicsize = sizeof(PyMethodObject), .tp_dealloc = (destructor)method_dealloc, @@ -516,7 +516,7 @@ instancemethod_new_impl(PyTypeObject *type, PyObject *function) } PyTypeObject PyInstanceMethod_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "instancemethod", .tp_basicsize = sizeof(PyInstanceMethodObject), .tp_dealloc = instancemethod_dealloc, diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h index e7bf3183af8522..f5c6d368371f79 100644 --- a/Objects/clinic/bytearrayobject.c.h +++ b/Objects/clinic/bytearrayobject.c.h @@ -24,7 +24,7 @@ bytearray___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(source), &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -247,7 +247,7 @@ bytearray_translate(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(delete), }, }; #undef NUM_KEYWORDS @@ -450,7 +450,7 @@ bytearray_split(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -572,7 +572,7 @@ bytearray_rsplit(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -949,7 +949,7 @@ bytearray_decode(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -1056,7 +1056,7 @@ bytearray_splitlines(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(keepends), }, }; #undef NUM_KEYWORDS @@ -1171,7 +1171,7 @@ bytearray_hex(PyByteArrayObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(bytes_per_sep), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h index 060056dafbd84f..6750c031f878bd 100644 --- a/Objects/clinic/bytesobject.c.h +++ b/Objects/clinic/bytesobject.c.h @@ -58,7 +58,7 @@ bytes_split(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -232,7 +232,7 @@ bytes_rsplit(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -434,7 +434,7 @@ bytes_translate(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(delete), }, }; #undef NUM_KEYWORDS @@ -717,7 +717,7 @@ bytes_decode(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -811,7 +811,7 @@ bytes_splitlines(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, P PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(keepends), }, }; #undef NUM_KEYWORDS @@ -926,7 +926,7 @@ bytes_hex(PyBytesObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(bytes_per_sep), }, }; #undef NUM_KEYWORDS @@ -988,7 +988,7 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(source), &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h index 5ad4b1fed73417..55dacf7fb8979d 100644 --- a/Objects/clinic/codeobject.c.h +++ b/Objects/clinic/codeobject.c.h @@ -200,7 +200,7 @@ code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(co_argcount), &_Py_ID(co_posonlyargcount), &_Py_ID(co_kwonlyargcount), &_Py_ID(co_nlocals), &_Py_ID(co_stacksize), &_Py_ID(co_flags), &_Py_ID(co_firstlineno), &_Py_ID(co_code), &_Py_ID(co_consts), &_Py_ID(co_names), &_Py_ID(co_varnames), &_Py_ID(co_freevars), &_Py_ID(co_cellvars), &_Py_ID(co_filename), &_Py_ID(co_name), &_Py_ID(co_qualname), &_Py_ID(co_linetable), &_Py_ID(co_exceptiontable), }, }; #undef NUM_KEYWORDS @@ -455,7 +455,7 @@ code__varname_from_oparg(PyCodeObject *self, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(oparg), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h index e92c6e985852de..9f31d3fadd6010 100644 --- a/Objects/clinic/complexobject.c.h +++ b/Objects/clinic/complexobject.c.h @@ -116,7 +116,7 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(real), &_Py_ID(imag), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/descrobject.c.h b/Objects/clinic/descrobject.c.h index 75706437df83f9..a7e38cacc80423 100644 --- a/Objects/clinic/descrobject.c.h +++ b/Objects/clinic/descrobject.c.h @@ -23,7 +23,7 @@ mappingproxy_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(mapping), }, }; #undef NUM_KEYWORDS @@ -109,7 +109,7 @@ property_init(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(fget), &_Py_ID(fset), &_Py_ID(fdel), &_Py_ID(doc), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/enumobject.c.h b/Objects/clinic/enumobject.c.h index adf78efd0d66f4..16275d59f132c4 100644 --- a/Objects/clinic/enumobject.c.h +++ b/Objects/clinic/enumobject.c.h @@ -38,7 +38,7 @@ enum_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(start), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/funcobject.c.h b/Objects/clinic/funcobject.c.h index c3a3a8edc39278..9fde46fab892b8 100644 --- a/Objects/clinic/funcobject.c.h +++ b/Objects/clinic/funcobject.c.h @@ -41,7 +41,7 @@ func_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(code), &_Py_ID(globals), &_Py_ID(name), &_Py_ID(argdefs), &_Py_ID(closure), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h index e3d6ffa9f76fdb..9a1025335644e3 100644 --- a/Objects/clinic/listobject.c.h +++ b/Objects/clinic/listobject.c.h @@ -180,7 +180,7 @@ list_sort(PyListObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(reverse), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/longobject.c.h b/Objects/clinic/longobject.c.h index c26ceafbc2be0d..0ddbcebb59b768 100644 --- a/Objects/clinic/longobject.c.h +++ b/Objects/clinic/longobject.c.h @@ -23,7 +23,7 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(base), }, }; #undef NUM_KEYWORDS @@ -294,7 +294,7 @@ int_to_bytes(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject * PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(length), &_Py_ID(byteorder), &_Py_ID(signed), }, }; #undef NUM_KEYWORDS @@ -408,7 +408,7 @@ int_from_bytes(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(bytes), &_Py_ID(byteorder), &_Py_ID(signed), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/memoryobject.c.h b/Objects/clinic/memoryobject.c.h index ff7b50bb114b05..623faee323de2b 100644 --- a/Objects/clinic/memoryobject.c.h +++ b/Objects/clinic/memoryobject.c.h @@ -29,7 +29,7 @@ memoryview(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(object), }, }; #undef NUM_KEYWORDS @@ -105,7 +105,7 @@ memoryview_cast(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(format), &_Py_ID(shape), }, }; #undef NUM_KEYWORDS @@ -216,7 +216,7 @@ memoryview_tobytes(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(order), }, }; #undef NUM_KEYWORDS @@ -311,7 +311,7 @@ memoryview_hex(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(bytes_per_sep), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/moduleobject.c.h b/Objects/clinic/moduleobject.c.h index 861bcea6215950..e51f3c3a58474f 100644 --- a/Objects/clinic/moduleobject.c.h +++ b/Objects/clinic/moduleobject.c.h @@ -31,7 +31,7 @@ module___init__(PyObject *self, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(doc), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/odictobject.c.h b/Objects/clinic/odictobject.c.h index 115a134e3f7f54..570fd6115a701c 100644 --- a/Objects/clinic/odictobject.c.h +++ b/Objects/clinic/odictobject.c.h @@ -32,7 +32,7 @@ OrderedDict_fromkeys(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(iterable), &_Py_ID(value), }, }; #undef NUM_KEYWORDS @@ -97,7 +97,7 @@ OrderedDict_setdefault(PyODictObject *self, PyObject *const *args, Py_ssize_t na PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(default), }, }; #undef NUM_KEYWORDS @@ -163,7 +163,7 @@ OrderedDict_pop(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(default), }, }; #undef NUM_KEYWORDS @@ -227,7 +227,7 @@ OrderedDict_popitem(PyODictObject *self, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(last), }, }; #undef NUM_KEYWORDS @@ -292,7 +292,7 @@ OrderedDict_move_to_end(PyODictObject *self, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(last), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/structseq.c.h b/Objects/clinic/structseq.c.h index 40ba18a544f4b3..2299ee090d6731 100644 --- a/Objects/clinic/structseq.c.h +++ b/Objects/clinic/structseq.c.h @@ -23,7 +23,7 @@ structseq_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sequence), &_Py_ID(dict), }, }; #undef NUM_KEYWORDS diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h index f640c997577363..914b090cffaed0 100644 --- a/Objects/clinic/unicodeobject.c.h +++ b/Objects/clinic/unicodeobject.c.h @@ -168,7 +168,7 @@ unicode_encode(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS @@ -261,7 +261,7 @@ unicode_expandtabs(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(tabsize), }, }; #undef NUM_KEYWORDS @@ -962,7 +962,7 @@ unicode_split(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -1084,7 +1084,7 @@ unicode_rsplit(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(maxsplit), }, }; #undef NUM_KEYWORDS @@ -1165,7 +1165,7 @@ unicode_splitlines(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(keepends), }, }; #undef NUM_KEYWORDS @@ -1422,7 +1422,7 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(object), &_Py_ID(encoding), &_Py_ID(errors), }, }; #undef NUM_KEYWORDS diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 755d0b85e7cf30..9e4accb29f7109 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1242,7 +1242,7 @@ lineiter_next(lineiterator *li) } PyTypeObject _PyLineIterator = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "line_iterator", /* tp_name */ sizeof(lineiterator), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1333,7 +1333,7 @@ positionsiter_next(positionsiterator* pi) } PyTypeObject _PyPositionsIterator = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "positions_iterator", /* tp_name */ sizeof(positionsiterator), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2137,7 +2137,7 @@ static struct PyMethodDef code_methods[] = { PyTypeObject PyCode_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "code", offsetof(PyCodeObject, co_code_adaptive), sizeof(_Py_CODEUNIT), diff --git a/Objects/complexobject.c b/Objects/complexobject.c index aee03ddfb07aec..d02afd12b1696b 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -1068,7 +1068,7 @@ static PyNumberMethods complex_as_number = { }; PyTypeObject PyComplex_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "complex", sizeof(PyComplexObject), 0, diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 334be75e8df9df..1cc4a2f61eb544 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -708,7 +708,7 @@ descr_traverse(PyObject *self, visitproc visit, void *arg) } PyTypeObject PyMethodDescr_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "method_descriptor", sizeof(PyMethodDescrObject), 0, @@ -748,7 +748,7 @@ PyTypeObject PyMethodDescr_Type = { /* This is for METH_CLASS in C, not for "f = classmethod(f)" in Python! */ PyTypeObject PyClassMethodDescr_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "classmethod_descriptor", sizeof(PyMethodDescrObject), 0, @@ -785,7 +785,7 @@ PyTypeObject PyClassMethodDescr_Type = { }; PyTypeObject PyMemberDescr_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "member_descriptor", sizeof(PyMemberDescrObject), 0, @@ -822,7 +822,7 @@ PyTypeObject PyMemberDescr_Type = { }; PyTypeObject PyGetSetDescr_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "getset_descriptor", sizeof(PyGetSetDescrObject), 0, @@ -859,7 +859,7 @@ PyTypeObject PyGetSetDescr_Type = { }; PyTypeObject PyWrapperDescr_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "wrapper_descriptor", sizeof(PyWrapperDescrObject), 0, @@ -1410,7 +1410,7 @@ wrapper_traverse(PyObject *self, visitproc visit, void *arg) } PyTypeObject _PyMethodWrapper_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "method-wrapper", /* tp_name */ sizeof(wrapperobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1878,7 +1878,7 @@ property_clear(PyObject *self) #include "clinic/descrobject.c.h" PyTypeObject PyDictProxy_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "mappingproxy", /* tp_name */ sizeof(mappingproxyobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1921,7 +1921,7 @@ PyTypeObject PyDictProxy_Type = { }; PyTypeObject PyProperty_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "property", /* tp_name */ sizeof(propertyobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 2ef520044340ee..0b63b7a002d577 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -3826,7 +3826,7 @@ PyDoc_STRVAR(dictionary_doc, " in the keyword argument list. For example: dict(one=1, two=2)"); PyTypeObject PyDict_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict", sizeof(PyDictObject), 0, @@ -4094,7 +4094,7 @@ dictiter_iternextkey(dictiterobject *di) } PyTypeObject PyDictIterKey_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_keyiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4193,7 +4193,7 @@ dictiter_iternextvalue(dictiterobject *di) } PyTypeObject PyDictIterValue_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_valueiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4317,7 +4317,7 @@ dictiter_iternextitem(dictiterobject *di) } PyTypeObject PyDictIterItem_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_itemiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -4452,7 +4452,7 @@ dictreviter_iternext(dictiterobject *di) } PyTypeObject PyDictRevIterKey_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_reversekeyiterator", sizeof(dictiterobject), .tp_dealloc = (destructor)dictiter_dealloc, @@ -4493,7 +4493,7 @@ dictiter_reduce(dictiterobject *di, PyObject *Py_UNUSED(ignored)) } PyTypeObject PyDictRevIterItem_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_reverseitemiterator", sizeof(dictiterobject), .tp_dealloc = (destructor)dictiter_dealloc, @@ -4505,7 +4505,7 @@ PyTypeObject PyDictRevIterItem_Type = { }; PyTypeObject PyDictRevIterValue_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_reversevalueiterator", sizeof(dictiterobject), .tp_dealloc = (destructor)dictiter_dealloc, @@ -5066,7 +5066,7 @@ static PyMethodDef dictkeys_methods[] = { }; PyTypeObject PyDictKeys_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_keys", /* tp_name */ sizeof(_PyDictViewObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -5172,7 +5172,7 @@ static PyMethodDef dictitems_methods[] = { }; PyTypeObject PyDictItems_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_items", /* tp_name */ sizeof(_PyDictViewObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -5253,7 +5253,7 @@ static PyMethodDef dictvalues_methods[] = { }; PyTypeObject PyDictValues_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "dict_values", /* tp_name */ sizeof(_PyDictViewObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/enumobject.c b/Objects/enumobject.c index c9d90584c26b7d..8707595edeb8cc 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -287,7 +287,7 @@ static PyMethodDef enum_methods[] = { }; PyTypeObject PyEnum_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "enumerate", /* tp_name */ sizeof(enumobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -499,7 +499,7 @@ static PyMethodDef reversediter_methods[] = { }; PyTypeObject PyReversed_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "reversed", /* tp_name */ sizeof(reversedobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/exceptions.c b/Objects/exceptions.c index a355244cf997e6..fa5a6845809c39 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -447,7 +447,7 @@ static struct PyMemberDef BaseException_members[] = { static PyTypeObject _PyExc_BaseException = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "BaseException", /*tp_name*/ sizeof(PyBaseExceptionObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -497,7 +497,7 @@ PyObject *PyExc_BaseException = (PyObject *)&_PyExc_BaseException; */ #define SimpleExtendsException(EXCBASE, EXCNAME, EXCDOC) \ static PyTypeObject _PyExc_ ## EXCNAME = { \ - PyVarObject_HEAD_INIT(NULL, 0) \ + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) \ # EXCNAME, \ sizeof(PyBaseExceptionObject), \ 0, (destructor)BaseException_dealloc, 0, 0, 0, 0, 0, 0, 0, \ @@ -512,7 +512,7 @@ PyObject *PyExc_ ## EXCNAME = (PyObject *)&_PyExc_ ## EXCNAME #define MiddlingExtendsException(EXCBASE, EXCNAME, EXCSTORE, EXCDOC) \ static PyTypeObject _PyExc_ ## EXCNAME = { \ - PyVarObject_HEAD_INIT(NULL, 0) \ + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) \ # EXCNAME, \ sizeof(Py ## EXCSTORE ## Object), \ 0, (destructor)EXCSTORE ## _dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ @@ -529,7 +529,7 @@ PyObject *PyExc_ ## EXCNAME = (PyObject *)&_PyExc_ ## EXCNAME EXCMETHODS, EXCMEMBERS, EXCGETSET, \ EXCSTR, EXCDOC) \ static PyTypeObject _PyExc_ ## EXCNAME = { \ - PyVarObject_HEAD_INIT(NULL, 0) \ + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) \ # EXCNAME, \ sizeof(Py ## EXCSTORE ## Object), 0, \ (destructor)EXCSTORE ## _dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ @@ -2923,7 +2923,7 @@ UnicodeEncodeError_str(PyObject *self) } static PyTypeObject _PyExc_UnicodeEncodeError = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "UnicodeEncodeError", sizeof(PyUnicodeErrorObject), 0, (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3030,7 +3030,7 @@ UnicodeDecodeError_str(PyObject *self) } static PyTypeObject _PyExc_UnicodeDecodeError = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "UnicodeDecodeError", sizeof(PyUnicodeErrorObject), 0, (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3127,7 +3127,7 @@ UnicodeTranslateError_str(PyObject *self) } static PyTypeObject _PyExc_UnicodeTranslateError = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "UnicodeTranslateError", sizeof(PyUnicodeErrorObject), 0, (destructor)UnicodeError_dealloc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3324,7 +3324,7 @@ free_preallocated_memerrors(struct _Py_exc_state *state) PyTypeObject _PyExc_MemoryError = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "MemoryError", sizeof(PyBaseExceptionObject), 0, (destructor)MemoryError_dealloc, 0, 0, 0, 0, 0, 0, 0, diff --git a/Objects/fileobject.c b/Objects/fileobject.c index e99e155f2b8c98..8c9f4abd34f217 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -423,7 +423,7 @@ static PyGetSetDef stdprinter_getsetlist[] = { }; PyTypeObject PyStdPrinter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "stderrprinter", /* tp_name */ sizeof(PyStdPrinter_Object), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/floatobject.c b/Objects/floatobject.c index d641311f1126cd..8f33f78cebce50 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1884,7 +1884,7 @@ static PyNumberMethods float_as_number = { }; PyTypeObject PyFloat_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "float", sizeof(PyFloatObject), 0, diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 63590d58809e3e..15574113648052 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -964,7 +964,7 @@ static PyMethodDef frame_methods[] = { }; PyTypeObject PyFrame_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "frame", offsetof(PyFrameObject, _f_frame_data) + offsetof(_PyInterpreterFrame, localsplus), diff --git a/Objects/funcobject.c b/Objects/funcobject.c index ce5d7bda32c032..899b19134faa71 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -852,7 +852,7 @@ func_descr_get(PyObject *func, PyObject *obj, PyObject *type) } PyTypeObject PyFunction_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "function", sizeof(PyFunctionObject), 0, @@ -1078,7 +1078,7 @@ Class methods are different than C++ or Java static methods.\n\ If you want those, see the staticmethod builtin."); PyTypeObject PyClassMethod_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "classmethod", sizeof(classmethod), 0, @@ -1271,7 +1271,7 @@ Static methods in Python are similar to those found in Java or C++.\n\ For a more advanced concept, see the classmethod builtin."); PyTypeObject PyStaticMethod_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "staticmethod", sizeof(staticmethod), 0, diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c index 888cb16edd1b46..99d5910a0b4fcd 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -898,7 +898,7 @@ static PyMethodDef ga_iter_methods[] = { // gh-91632: _Py_GenericAliasIterType is exported to be cleared // in _PyTypes_FiniTypes. PyTypeObject _Py_GenericAliasIterType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "generic_alias_iterator", .tp_basicsize = sizeof(gaiterobject), .tp_iter = PyObject_SelfIter, @@ -925,7 +925,7 @@ ga_iter(PyObject *self) { // - argument clinic? // - cache? PyTypeObject Py_GenericAliasType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "types.GenericAlias", .tp_doc = genericalias__doc__, .tp_basicsize = sizeof(gaobject), diff --git a/Objects/genobject.c b/Objects/genobject.c index 6316fa9865fe65..d434cff15ff5e3 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -812,7 +812,7 @@ static PyAsyncMethods gen_as_async = { PyTypeObject PyGen_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "generator", /* tp_name */ offsetof(PyGenObject, gi_iframe) + offsetof(_PyInterpreterFrame, localsplus), /* tp_basicsize */ @@ -1163,7 +1163,7 @@ static PyAsyncMethods coro_as_async = { }; PyTypeObject PyCoro_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "coroutine", /* tp_name */ offsetof(PyCoroObject, cr_iframe) + offsetof(_PyInterpreterFrame, localsplus), /* tp_basicsize */ @@ -1263,7 +1263,7 @@ static PyMethodDef coro_wrapper_methods[] = { }; PyTypeObject _PyCoroWrapper_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "coroutine_wrapper", sizeof(PyCoroWrapper), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1582,7 +1582,7 @@ static PyAsyncMethods async_gen_as_async = { PyTypeObject PyAsyncGen_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "async_generator", /* tp_name */ offsetof(PyAsyncGenObject, ag_iframe) + offsetof(_PyInterpreterFrame, localsplus), /* tp_basicsize */ @@ -1854,7 +1854,7 @@ static PyAsyncMethods async_gen_asend_as_async = { PyTypeObject _PyAsyncGenASend_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "async_generator_asend", /* tp_name */ sizeof(PyAsyncGenASend), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1968,7 +1968,7 @@ async_gen_wrapped_val_traverse(_PyAsyncGenWrappedValue *o, PyTypeObject _PyAsyncGenWrappedValue_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "async_generator_wrapped_value", /* tp_name */ sizeof(_PyAsyncGenWrappedValue), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2271,7 +2271,7 @@ static PyAsyncMethods async_gen_athrow_as_async = { PyTypeObject _PyAsyncGenAThrow_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "async_generator_athrow", /* tp_name */ sizeof(PyAsyncGenAThrow), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/interpreteridobject.c b/Objects/interpreteridobject.c index 7b3e31beded594..676d5b9e7c0268 100644 --- a/Objects/interpreteridobject.c +++ b/Objects/interpreteridobject.c @@ -225,7 +225,7 @@ PyDoc_STRVAR(interpid_doc, "A interpreter ID identifies a interpreter and may be used as an int."); PyTypeObject _PyInterpreterID_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "InterpreterID", /* tp_name */ sizeof(interpid), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/iterobject.c b/Objects/iterobject.c index 7cb17a6ca4ab56..c5bf6ab16bfe58 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -140,7 +140,7 @@ static PyMethodDef seqiter_methods[] = { }; PyTypeObject PySeqIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "iterator", /* tp_name */ sizeof(seqiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -262,7 +262,7 @@ static PyMethodDef calliter_methods[] = { }; PyTypeObject PyCallIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "callable_iterator", /* tp_name */ sizeof(calliterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -464,7 +464,7 @@ static PyAsyncMethods anextawaitable_as_async = { }; PyTypeObject _PyAnextAwaitable_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "anext_awaitable", /* tp_name */ sizeof(anextawaitableobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/listobject.c b/Objects/listobject.c index f1edfb3a9a039d..1ac6b1c568895b 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -3097,7 +3097,7 @@ static PyMappingMethods list_as_mapping = { }; PyTypeObject PyList_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "list", sizeof(PyListObject), 0, @@ -3163,7 +3163,7 @@ static PyMethodDef listiter_methods[] = { }; PyTypeObject PyListIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "list_iterator", /* tp_name */ sizeof(_PyListIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -3309,7 +3309,7 @@ static PyMethodDef listreviter_methods[] = { }; PyTypeObject PyListRevIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "list_reverseiterator", /* tp_name */ sizeof(listreviterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/longobject.c b/Objects/longobject.c index bb4eac0d932bb8..633c5507b5f472 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -6229,7 +6229,7 @@ static PyNumberMethods long_as_number = { }; PyTypeObject PyLong_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "int", /* tp_name */ offsetof(PyLongObject, long_value.ob_digit), /* tp_basicsize */ sizeof(digit), /* tp_itemsize */ diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 1d6cc3b508448d..b6a5d543bf6baa 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -143,7 +143,7 @@ mbuf_clear(_PyManagedBufferObject *self) } PyTypeObject _PyManagedBuffer_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "managedbuffer", sizeof(_PyManagedBufferObject), 0, @@ -3279,7 +3279,7 @@ memory_iter(PyObject *seq) } PyTypeObject _PyMemoryIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "memory_iterator", .tp_basicsize = sizeof(memoryiterobject), // methods @@ -3292,7 +3292,7 @@ PyTypeObject _PyMemoryIter_Type = { }; PyTypeObject PyMemoryView_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "memoryview", /* tp_name */ offsetof(PyMemoryViewObject, ob_array), /* tp_basicsize */ sizeof(Py_ssize_t), /* tp_itemsize */ diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 51752dec3dd08c..a12b20494a2bc0 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -327,7 +327,7 @@ meth_hash(PyCFunctionObject *a) PyTypeObject PyCFunction_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "builtin_function_or_method", sizeof(PyCFunctionObject), 0, @@ -363,7 +363,7 @@ PyTypeObject PyCFunction_Type = { }; PyTypeObject PyCMethod_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "builtin_method", .tp_basicsize = sizeof(PyCMethodObject), .tp_base = &PyCFunction_Type, diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index a0be19a3ca8ac8..9af78280d8ded4 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -17,7 +17,7 @@ static PyMemberDef module_members[] = { PyTypeObject PyModuleDef_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "moduledef", /* tp_name */ sizeof(PyModuleDef), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -935,7 +935,7 @@ static PyGetSetDef module_getsets[] = { }; PyTypeObject PyModule_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "module", /* tp_name */ sizeof(PyModuleObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c index 2cc4ddd3c91daa..cce919a94e6503 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -200,7 +200,7 @@ PyDoc_STRVAR(namespace_doc, SimpleNamespace(**kwargs)"); PyTypeObject _PyNamespace_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "types.SimpleNamespace", /* tp_name */ sizeof(_PyNamespaceObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/object.c b/Objects/object.c index 9dd5eb998217f6..69c762dcfdbb3a 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1825,7 +1825,7 @@ static PyNumberMethods none_as_number = { }; PyTypeObject _PyNone_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "NoneType", 0, 0, @@ -1926,7 +1926,7 @@ static PyNumberMethods notimplemented_as_number = { }; PyTypeObject _PyNotImplemented_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "NotImplementedType", 0, 0, diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 39b0f684510578..f4172859dd1219 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1495,7 +1495,7 @@ odict_init(PyObject *self, PyObject *args, PyObject *kwds) /* PyODict_Type */ PyTypeObject PyODict_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "collections.OrderedDict", /* tp_name */ sizeof(PyODictObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1768,7 +1768,7 @@ static PyMethodDef odictiter_methods[] = { }; PyTypeObject PyODictIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "odict_iterator", /* tp_name */ sizeof(odictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1861,7 +1861,7 @@ static PyMethodDef odictkeys_methods[] = { }; PyTypeObject PyODictKeys_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "odict_keys", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1928,7 +1928,7 @@ static PyMethodDef odictitems_methods[] = { }; PyTypeObject PyODictItems_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "odict_items", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1995,7 +1995,7 @@ static PyMethodDef odictvalues_methods[] = { }; PyTypeObject PyODictValues_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "odict_values", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/picklebufobject.c b/Objects/picklebufobject.c index aaa852cfbb05b0..5a3e0b4d228ece 100644 --- a/Objects/picklebufobject.c +++ b/Objects/picklebufobject.c @@ -204,7 +204,7 @@ static PyMethodDef picklebuf_methods[] = { }; PyTypeObject PyPickleBuffer_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "pickle.PickleBuffer", .tp_doc = PyDoc_STR("Wrapper for potentially out-of-band buffers"), .tp_basicsize = sizeof(PyPickleBufferObject), diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index beb86b9623bdbc..70bde0208b03f7 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -763,7 +763,7 @@ static PyMemberDef range_members[] = { }; PyTypeObject PyRange_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "range", /* Name of this type */ sizeof(rangeobject), /* Basic object size */ 0, /* Item size for varobject */ @@ -892,7 +892,7 @@ static PyMethodDef rangeiter_methods[] = { }; PyTypeObject PyRangeIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "range_iterator", /* tp_name */ sizeof(_PyRangeIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1089,7 +1089,7 @@ longrangeiter_next(longrangeiterobject *r) } PyTypeObject PyLongRangeIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "longrange_iterator", /* tp_name */ sizeof(longrangeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/setobject.c b/Objects/setobject.c index fcdda2a0bca2b6..15b2698b1bb3b8 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -828,7 +828,7 @@ static PyObject *setiter_iternext(setiterobject *si) } PyTypeObject PySetIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "set_iterator", /* tp_name */ sizeof(setiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2112,7 +2112,7 @@ set(iterable) -> new set object\n\ Build an unordered collection of unique elements."); PyTypeObject PySet_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "set", /* tp_name */ sizeof(PySetObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2213,7 +2213,7 @@ frozenset(iterable) -> frozenset object\n\ Build an immutable unordered collection of unique elements."); PyTypeObject PyFrozenSet_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "frozenset", /* tp_name */ sizeof(PySetObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2520,7 +2520,7 @@ dummy_dealloc(PyObject* ignore) } static PyTypeObject _PySetDummy_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) " type", 0, 0, diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 584ebce721faed..095be644e23d53 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -47,7 +47,7 @@ static PyMethodDef ellipsis_methods[] = { }; PyTypeObject PyEllipsis_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "ellipsis", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -665,7 +665,7 @@ slicehash(PySliceObject *v) } PyTypeObject PySlice_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "slice", /* Name of this type */ sizeof(PySliceObject), /* Basic object size */ 0, /* Item size for varobject */ diff --git a/Objects/stringlib/clinic/transmogrify.h.h b/Objects/stringlib/clinic/transmogrify.h.h index 49388cf043ced2..f126ceb896726f 100644 --- a/Objects/stringlib/clinic/transmogrify.h.h +++ b/Objects/stringlib/clinic/transmogrify.h.h @@ -34,7 +34,7 @@ stringlib_expandtabs(PyObject *self, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(tabsize), }, }; #undef NUM_KEYWORDS diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index ccd7c77c0a03fd..dbead4ca462f19 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -1064,7 +1064,7 @@ static PyMethodDef formatteriter_methods[] = { }; static PyTypeObject PyFormatterIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "formatteriterator", /* tp_name */ sizeof(formatteriterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1199,7 +1199,7 @@ static PyMethodDef fieldnameiter_methods[] = { }; static PyTypeObject PyFieldNameIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "fieldnameiterator", /* tp_name */ sizeof(fieldnameiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 61fab4078d66ba..2c35287773f364 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -842,7 +842,7 @@ static PyMappingMethods tuple_as_mapping = { static PyObject *tuple_iter(PyObject *seq); PyTypeObject PyTuple_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "tuple", sizeof(PyTupleObject) - sizeof(PyObject *), sizeof(PyObject *), @@ -1086,7 +1086,7 @@ static PyMethodDef tupleiter_methods[] = { }; PyTypeObject PyTupleIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "tuple_iterator", /* tp_name */ sizeof(_PyTupleIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 24541bddbbc33f..950d6e0e8f628b 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4837,7 +4837,7 @@ static PyNumberMethods type_as_number = { }; PyTypeObject PyType_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "type", /* tp_name */ sizeof(PyHeapTypeObject), /* tp_basicsize */ sizeof(PyMemberDef), /* tp_itemsize */ @@ -6048,7 +6048,7 @@ PyDoc_STRVAR(object_doc, "instance that has no instance attributes and cannot be given any.\n"); PyTypeObject PyBaseObject_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "object", /* tp_name */ sizeof(PyObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -9709,7 +9709,7 @@ super_vectorcall(PyObject *self, PyObject *const *args, } PyTypeObject PySuper_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "super", /* tp_name */ sizeof(superobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 85e5ae735709fd..0dcd8c3cb13fb1 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7768,7 +7768,7 @@ static PyMethodDef encoding_map_methods[] = { }; static PyTypeObject EncodingMapType = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) .tp_name = "EncodingMap", .tp_basicsize = sizeof(struct encoding_map), /* methods */ @@ -14465,7 +14465,7 @@ errors defaults to 'strict'."); static PyObject *unicode_iter(PyObject *seq); PyTypeObject PyUnicode_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "str", /* tp_name */ sizeof(PyUnicodeObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -14847,7 +14847,7 @@ static PyMethodDef unicodeiter_methods[] = { }; PyTypeObject PyUnicodeIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "str_iterator", /* tp_name */ sizeof(unicodeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -14880,7 +14880,7 @@ PyTypeObject PyUnicodeIter_Type = { }; PyTypeObject _PyUnicodeASCIIIter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "str_ascii_iterator", .tp_basicsize = sizeof(unicodeiterobject), .tp_dealloc = (destructor)unicodeiter_dealloc, diff --git a/Objects/unionobject.c b/Objects/unionobject.c index f273f7d15ef25f..d390f3828e2042 100644 --- a/Objects/unionobject.c +++ b/Objects/unionobject.c @@ -364,7 +364,7 @@ _Py_union_args(PyObject *self) } PyTypeObject _PyUnion_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "types.UnionType", .tp_doc = PyDoc_STR("Represent a PEP 604 union type\n" "\n" diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 5a3e49a6fe45e3..a27e0f1c729d6b 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -369,7 +369,7 @@ static PyMethodDef weakref_methods[] = { PyTypeObject _PyWeakref_RefType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) .tp_name = "weakref.ReferenceType", .tp_basicsize = sizeof(PyWeakReference), .tp_dealloc = weakref_dealloc, @@ -718,7 +718,7 @@ static PyMappingMethods proxy_as_mapping = { PyTypeObject _PyWeakref_ProxyType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "weakref.ProxyType", sizeof(PyWeakReference), 0, @@ -753,7 +753,7 @@ _PyWeakref_ProxyType = { PyTypeObject _PyWeakref_CallableProxyType = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "weakref.CallableProxyType", sizeof(PyWeakReference), 0, diff --git a/PC/_msi.c b/PC/_msi.c index b104e3c6ef548c..4f7e99889e6d9d 100644 --- a/PC/_msi.c +++ b/PC/_msi.c @@ -592,7 +592,7 @@ static PyMethodDef record_methods[] = { }; static PyTypeObject record_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_msi.Record", /*tp_name*/ sizeof(msiobj), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -805,7 +805,7 @@ static PyMethodDef summary_methods[] = { }; static PyTypeObject summary_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_msi.SummaryInformation", /*tp_name*/ sizeof(msiobj), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -983,7 +983,7 @@ static PyMethodDef view_methods[] = { }; static PyTypeObject msiview_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_msi.View", /*tp_name*/ sizeof(msiobj), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -1116,7 +1116,7 @@ static PyMethodDef db_methods[] = { }; static PyTypeObject msidb_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "_msi.Database", /*tp_name*/ sizeof(msiobj), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/PC/clinic/_testconsole.c.h b/PC/clinic/_testconsole.c.h index b2f3b4ce8b08a2..6a54ea8401b53c 100644 --- a/PC/clinic/_testconsole.c.h +++ b/PC/clinic/_testconsole.c.h @@ -35,7 +35,7 @@ _testconsole_write_input(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), &_Py_ID(s), }, }; #undef NUM_KEYWORDS @@ -100,7 +100,7 @@ _testconsole_read_output(PyObject *module, PyObject *const *args, Py_ssize_t nar PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(file), }, }; #undef NUM_KEYWORDS diff --git a/PC/clinic/_wmimodule.cpp.h b/PC/clinic/_wmimodule.cpp.h index e2b947f339da60..f1af43a4e696d3 100644 --- a/PC/clinic/_wmimodule.cpp.h +++ b/PC/clinic/_wmimodule.cpp.h @@ -35,7 +35,7 @@ _wmi_exec_query(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(query), }, }; #undef NUM_KEYWORDS diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h index 7a9474301da8a1..2c99fab42f7c90 100644 --- a/PC/clinic/winreg.c.h +++ b/PC/clinic/winreg.c.h @@ -115,7 +115,7 @@ winreg_HKEYType___exit__(PyHKEYObject *self, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(exc_type), &_Py_ID(exc_value), &_Py_ID(traceback), }, }; #undef NUM_KEYWORDS @@ -353,7 +353,7 @@ winreg_CreateKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(sub_key), &_Py_ID(reserved), &_Py_ID(access), }, }; #undef NUM_KEYWORDS @@ -538,7 +538,7 @@ winreg_DeleteKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(sub_key), &_Py_ID(access), &_Py_ID(reserved), }, }; #undef NUM_KEYWORDS @@ -970,7 +970,7 @@ winreg_OpenKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(sub_key), &_Py_ID(reserved), &_Py_ID(access), }, }; #undef NUM_KEYWORDS @@ -1087,7 +1087,7 @@ winreg_OpenKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(sub_key), &_Py_ID(reserved), &_Py_ID(access), }, }; #undef NUM_KEYWORDS diff --git a/PC/clinic/winsound.c.h b/PC/clinic/winsound.c.h index 241d547c267a4c..1350f531ed3279 100644 --- a/PC/clinic/winsound.c.h +++ b/PC/clinic/winsound.c.h @@ -37,7 +37,7 @@ winsound_PlaySound(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sound), &_Py_ID(flags), }, }; #undef NUM_KEYWORDS @@ -103,7 +103,7 @@ winsound_Beep(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(frequency), &_Py_ID(duration), }, }; #undef NUM_KEYWORDS @@ -168,7 +168,7 @@ winsound_MessageBeep(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(type), }, }; #undef NUM_KEYWORDS diff --git a/PC/winreg.c b/PC/winreg.c index 073598a12a68aa..97a2e898d4ca9f 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -353,7 +353,7 @@ static PyMemberDef PyHKEY_memberlist[] = { /* The type itself */ PyTypeObject PyHKEY_Type = { - PyVarObject_HEAD_INIT(0, 0) /* fill in type at module init */ + _PyVarObject_HEAD_IMMORTAL_INIT(0, 0) /* fill in type at module init */ "PyHKEY", sizeof(PyHKEYObject), 0, diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index fcb4d7a9a975c6..27d5e673294378 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -624,7 +624,7 @@ Return an iterator yielding those items of iterable for which function(item)\n\ is true. If function is None, return the items that are true."); PyTypeObject PyFilter_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "filter", /* tp_name */ sizeof(filterobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -1413,7 +1413,7 @@ Make an iterator that computes the function using arguments from\n\ each of the iterables. Stops when the shortest iterable is exhausted."); PyTypeObject PyMap_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "map", /* tp_name */ sizeof(mapobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -2920,7 +2920,7 @@ If strict is true and one of the arguments is exhausted before the others,\n\ raise a ValueError."); PyTypeObject PyZip_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "zip", /* tp_name */ sizeof(zipobject), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Python/clinic/Python-tokenize.c.h b/Python/clinic/Python-tokenize.c.h index 6af93743f40dab..343c9d6567e60e 100644 --- a/Python/clinic/Python-tokenize.c.h +++ b/Python/clinic/Python-tokenize.c.h @@ -23,7 +23,7 @@ tokenizeriter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(source), }, }; #undef NUM_KEYWORDS diff --git a/Python/clinic/_warnings.c.h b/Python/clinic/_warnings.c.h index 432e554af85cf6..eed35bd1710bf2 100644 --- a/Python/clinic/_warnings.c.h +++ b/Python/clinic/_warnings.c.h @@ -48,7 +48,7 @@ warnings_warn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(message), &_Py_ID(category), &_Py_ID(stacklevel), &_Py_ID(source), &_Py_ID(skip_file_prefixes), }, }; #undef NUM_KEYWORDS @@ -155,7 +155,7 @@ warnings_warn_explicit(PyObject *module, PyObject *const *args, Py_ssize_t nargs PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(message), &_Py_ID(category), &_Py_ID(filename), &_Py_ID(lineno), &_Py_ID(module), &_Py_ID(registry), &_Py_ID(module_globals), &_Py_ID(source), }, }; #undef NUM_KEYWORDS diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index b77b4a1e4b410e..fb09d4a6ae1d57 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -48,7 +48,7 @@ builtin___import__(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(name), &_Py_ID(globals), &_Py_ID(locals), &_Py_ID(fromlist), &_Py_ID(level), }, }; #undef NUM_KEYWORDS @@ -293,7 +293,7 @@ builtin_compile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(source), &_Py_ID(filename), &_Py_ID(mode), &_Py_ID(flags), &_Py_ID(dont_inherit), &_Py_ID(optimize), &_Py_ID(_feature_version), }, }; #undef NUM_KEYWORDS @@ -538,7 +538,7 @@ builtin_exec(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(closure), }, }; #undef NUM_KEYWORDS @@ -988,7 +988,7 @@ builtin_pow(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(base), &_Py_ID(exp), &_Py_ID(mod), }, }; #undef NUM_KEYWORDS @@ -1062,7 +1062,7 @@ builtin_print(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(sep), &_Py_ID(end), &_Py_ID(file), &_Py_ID(flush), }, }; #undef NUM_KEYWORDS @@ -1201,7 +1201,7 @@ builtin_round(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(number), &_Py_ID(ndigits), }, }; #undef NUM_KEYWORDS @@ -1302,7 +1302,7 @@ builtin_sum(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(start), }, }; #undef NUM_KEYWORDS diff --git a/Python/clinic/import.c.h b/Python/clinic/import.c.h index cb74be6a422124..e6161e474c1eed 100644 --- a/Python/clinic/import.c.h +++ b/Python/clinic/import.c.h @@ -207,7 +207,7 @@ _imp_find_frozen(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(withdata), }, }; #undef NUM_KEYWORDS @@ -594,7 +594,7 @@ _imp_source_hash(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(key), &_Py_ID(source), }, }; #undef NUM_KEYWORDS diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h index 46252dd404325b..0579795aa44b56 100644 --- a/Python/clinic/sysmodule.c.h +++ b/Python/clinic/sysmodule.c.h @@ -32,7 +32,7 @@ sys_addaudithook(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(hook), }, }; #undef NUM_KEYWORDS @@ -486,7 +486,7 @@ sys_set_coroutine_origin_tracking_depth(PyObject *module, PyObject *const *args, PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(depth), }, }; #undef NUM_KEYWORDS @@ -787,7 +787,7 @@ sys_set_int_max_str_digits(PyObject *module, PyObject *const *args, Py_ssize_t n PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(maxdigits), }, }; #undef NUM_KEYWORDS @@ -1305,7 +1305,7 @@ sys__getframemodulename(PyObject *module, PyObject *const *args, Py_ssize_t narg PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(depth), }, }; #undef NUM_KEYWORDS diff --git a/Python/clinic/traceback.c.h b/Python/clinic/traceback.c.h index 3c344934971643..35f613c3665c7b 100644 --- a/Python/clinic/traceback.c.h +++ b/Python/clinic/traceback.c.h @@ -30,7 +30,7 @@ tb_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; } _kwtuple = { - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = { &_Py_ID(tb_next), &_Py_ID(tb_frame), &_Py_ID(tb_lasti), &_Py_ID(tb_lineno), }, }; #undef NUM_KEYWORDS diff --git a/Python/context.c b/Python/context.c index 5d385508405ede..4d330647a7f650 100644 --- a/Python/context.c +++ b/Python/context.c @@ -705,7 +705,7 @@ static PyMappingMethods PyContext_as_mapping = { }; PyTypeObject PyContext_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "_contextvars.Context", sizeof(PyContext), .tp_methods = PyContext_methods, @@ -1056,7 +1056,7 @@ static PyMethodDef PyContextVar_methods[] = { }; PyTypeObject PyContextVar_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "_contextvars.ContextVar", sizeof(PyContextVar), .tp_methods = PyContextVar_methods, @@ -1195,7 +1195,7 @@ static PyMethodDef PyContextTokenType_methods[] = { }; PyTypeObject PyContextToken_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "_contextvars.Token", sizeof(PyContextToken), .tp_methods = PyContextTokenType_methods, @@ -1254,7 +1254,7 @@ context_token_missing_tp_dealloc(_PyContextTokenMissing *Py_UNUSED(self)) PyTypeObject _PyContextTokenMissing_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "Token.MISSING", sizeof(_PyContextTokenMissing), .tp_dealloc = (destructor)context_token_missing_tp_dealloc, diff --git a/Python/hamt.c b/Python/hamt.c index 8cb94641bef251..c4f33c6847fb73 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -2550,7 +2550,7 @@ hamt_baseiter_new(PyTypeObject *type, binaryfunc yield, PyHamtObject *o) PyTypeObject _PyHamtItems_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "items", ITERATOR_TYPE_SHARED_SLOTS }; @@ -2573,7 +2573,7 @@ _PyHamt_NewIterItems(PyHamtObject *o) PyTypeObject _PyHamtKeys_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "keys", ITERATOR_TYPE_SHARED_SLOTS }; @@ -2596,7 +2596,7 @@ _PyHamt_NewIterKeys(PyHamtObject *o) PyTypeObject _PyHamtValues_Type = { - PyVarObject_HEAD_INIT(NULL, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(NULL, 0) "values", ITERATOR_TYPE_SHARED_SLOTS }; @@ -2832,7 +2832,7 @@ static PyMappingMethods PyHamt_as_mapping = { }; PyTypeObject _PyHamt_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "hamt", sizeof(PyHamtObject), .tp_methods = PyHamt_methods, @@ -2855,7 +2855,7 @@ PyTypeObject _PyHamt_Type = { PyTypeObject _PyHamt_ArrayNode_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "hamt_array_node", sizeof(PyHamtNode_Array), 0, @@ -2868,7 +2868,7 @@ PyTypeObject _PyHamt_ArrayNode_Type = { }; PyTypeObject _PyHamt_BitmapNode_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "hamt_bitmap_node", sizeof(PyHamtNode_Bitmap) - sizeof(PyObject *), sizeof(PyObject *), @@ -2881,7 +2881,7 @@ PyTypeObject _PyHamt_BitmapNode_Type = { }; PyTypeObject _PyHamt_CollisionNode_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "hamt_collision_node", sizeof(PyHamtNode_Collision) - sizeof(PyObject *), sizeof(PyObject *), diff --git a/Python/symtable.c b/Python/symtable.c index df7473943f3fc1..a899e852edbd7c 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -159,7 +159,7 @@ static PyMemberDef ste_memberlist[] = { }; PyTypeObject PySTEntry_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "symtable entry", sizeof(PySTEntryObject), 0, diff --git a/Python/traceback.c b/Python/traceback.c index 097f69c76abfe1..51eab54fb3c912 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -187,7 +187,7 @@ tb_clear(PyTracebackObject *tb) } PyTypeObject PyTraceBack_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) + _PyVarObject_HEAD_IMMORTAL_INIT(&PyType_Type, 0) "traceback", sizeof(PyTracebackObject), 0, diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index b8b2b75c749152..f772be5e0b6d97 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -576,7 +576,7 @@ def declare_parser(f, *, hasformat=False): PyObject_VAR_HEAD PyObject *ob_item[NUM_KEYWORDS]; }} _kwtuple = {{ - .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_base = _PyVarObject_HEAD_IMMORTAL_INIT(&PyTuple_Type, NUM_KEYWORDS) .ob_item = {{ {keywords_py} }}, }}; #undef NUM_KEYWORDS From 5202592d2e04c8c48f9d7540374317484665138a Mon Sep 17 00:00:00 2001 From: Eddie Elizondo Date: Thu, 6 Apr 2023 01:39:08 -0400 Subject: [PATCH 2/3] Add blurb --- .../2023-04-06-01-38-55.gh-issue-84436.PXzsBG.rst | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-04-06-01-38-55.gh-issue-84436.PXzsBG.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-04-06-01-38-55.gh-issue-84436.PXzsBG.rst b/Misc/NEWS.d/next/Core and Builtins/2023-04-06-01-38-55.gh-issue-84436.PXzsBG.rst new file mode 100644 index 00000000000000..3c2ee476958de0 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2023-04-06-01-38-55.gh-issue-84436.PXzsBG.rst @@ -0,0 +1,3 @@ +Replace all internal uses of PyVarObject_HEAD_INIT fo +_PyVarObject_HEAD_IMMORTAL_INIT to be able to initialize them as immortal +objects since they live thorughout the entire execution From 26f9e652b49eb368e4b2a413393f215863588b72 Mon Sep 17 00:00:00 2001 From: Eddie Elizondo Date: Thu, 6 Apr 2023 01:56:40 -0400 Subject: [PATCH 3/3] Regen clinic --- Modules/_blake2/clinic/blake2b_impl.c.h | 2 +- Modules/_blake2/clinic/blake2s_impl.c.h | 2 +- Modules/_io/clinic/_iomodule.c.h | 2 +- Modules/_io/clinic/bufferedio.c.h | 2 +- Modules/_io/clinic/bytesio.c.h | 2 +- Modules/_io/clinic/fileio.c.h | 2 +- Modules/_io/clinic/stringio.c.h | 2 +- Modules/_io/clinic/textio.c.h | 2 +- Modules/_io/clinic/winconsoleio.c.h | 2 +- Modules/_multiprocessing/clinic/posixshmem.c.h | 2 +- Modules/_multiprocessing/clinic/semaphore.c.h | 2 +- Modules/_sha3/clinic/sha3module.c.h | 2 +- Modules/_sqlite/clinic/connection.c.h | 2 +- Modules/_sqlite/clinic/cursor.c.h | 2 +- Modules/_sqlite/clinic/module.c.h | 2 +- Modules/_sre/clinic/sre.c.h | 2 +- Modules/_ssl/clinic/cert.c.h | 2 +- Modules/cjkcodecs/clinic/multibytecodec.c.h | 2 +- Modules/clinic/_asynciomodule.c.h | 2 +- Modules/clinic/_bisectmodule.c.h | 2 +- Modules/clinic/_bz2module.c.h | 2 +- Modules/clinic/_codecsmodule.c.h | 2 +- Modules/clinic/_csv.c.h | 2 +- Modules/clinic/_cursesmodule.c.h | 2 +- Modules/clinic/_datetimemodule.c.h | 2 +- Modules/clinic/_elementtree.c.h | 2 +- Modules/clinic/_functoolsmodule.c.h | 2 +- Modules/clinic/_hashopenssl.c.h | 2 +- Modules/clinic/_lzmamodule.c.h | 2 +- Modules/clinic/_opcode.c.h | 2 +- Modules/clinic/_pickle.c.h | 2 +- Modules/clinic/_queuemodule.c.h | 2 +- Modules/clinic/_ssl.c.h | 2 +- Modules/clinic/_struct.c.h | 2 +- Modules/clinic/_testclinic.c.h | 2 +- Modules/clinic/_testinternalcapi.c.h | 2 +- Modules/clinic/_testmultiphase.c.h | 2 +- Modules/clinic/_winapi.c.h | 2 +- Modules/clinic/_zoneinfo.c.h | 2 +- Modules/clinic/binascii.c.h | 2 +- Modules/clinic/cmathmodule.c.h | 2 +- Modules/clinic/gcmodule.c.h | 2 +- Modules/clinic/grpmodule.c.h | 2 +- Modules/clinic/itertoolsmodule.c.h | 2 +- Modules/clinic/mathmodule.c.h | 2 +- Modules/clinic/md5module.c.h | 2 +- Modules/clinic/overlapped.c.h | 2 +- Modules/clinic/posixmodule.c.h | 2 +- Modules/clinic/pyexpat.c.h | 2 +- Modules/clinic/selectmodule.c.h | 2 +- Modules/clinic/sha1module.c.h | 2 +- Modules/clinic/sha2module.c.h | 2 +- Modules/clinic/socketmodule.c.h | 2 +- Modules/clinic/syslogmodule.c.h | 2 +- Modules/clinic/zlibmodule.c.h | 2 +- Objects/clinic/bytearrayobject.c.h | 2 +- Objects/clinic/bytesobject.c.h | 2 +- Objects/clinic/codeobject.c.h | 2 +- Objects/clinic/complexobject.c.h | 2 +- Objects/clinic/descrobject.c.h | 2 +- Objects/clinic/enumobject.c.h | 2 +- Objects/clinic/funcobject.c.h | 2 +- Objects/clinic/listobject.c.h | 2 +- Objects/clinic/longobject.c.h | 2 +- Objects/clinic/memoryobject.c.h | 2 +- Objects/clinic/moduleobject.c.h | 2 +- Objects/clinic/odictobject.c.h | 2 +- Objects/clinic/structseq.c.h | 2 +- Objects/clinic/unicodeobject.c.h | 2 +- Objects/stringlib/clinic/transmogrify.h.h | 2 +- PC/clinic/_testconsole.c.h | 2 +- PC/clinic/_wmimodule.cpp.h | 2 +- PC/clinic/winreg.c.h | 2 +- PC/clinic/winsound.c.h | 2 +- Python/clinic/Python-tokenize.c.h | 2 +- Python/clinic/_warnings.c.h | 2 +- Python/clinic/bltinmodule.c.h | 2 +- Python/clinic/import.c.h | 2 +- Python/clinic/sysmodule.c.h | 2 +- Python/clinic/traceback.c.h | 2 +- 80 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Modules/_blake2/clinic/blake2b_impl.c.h b/Modules/_blake2/clinic/blake2b_impl.c.h index 3609b3eb58f4f8..0fd7cdebcb463d 100644 --- a/Modules/_blake2/clinic/blake2b_impl.c.h +++ b/Modules/_blake2/clinic/blake2b_impl.c.h @@ -276,4 +276,4 @@ _blake2_blake2b_hexdigest(BLAKE2bObject *self, PyObject *Py_UNUSED(ignored)) { return _blake2_blake2b_hexdigest_impl(self); } -/*[clinic end generated code: output=996b4fe396824797 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=145b445fabbe2157 input=a9049054013a1b77]*/ diff --git a/Modules/_blake2/clinic/blake2s_impl.c.h b/Modules/_blake2/clinic/blake2s_impl.c.h index c1bc4ea9ce6ea3..f121567fb37f85 100644 --- a/Modules/_blake2/clinic/blake2s_impl.c.h +++ b/Modules/_blake2/clinic/blake2s_impl.c.h @@ -276,4 +276,4 @@ _blake2_blake2s_hexdigest(BLAKE2sObject *self, PyObject *Py_UNUSED(ignored)) { return _blake2_blake2s_hexdigest_impl(self); } -/*[clinic end generated code: output=bd0fb7639e450618 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=93569bda990ee77a input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/_iomodule.c.h b/Modules/_io/clinic/_iomodule.c.h index 97ef6e3c040309..6b8073800c75b7 100644 --- a/Modules/_io/clinic/_iomodule.c.h +++ b/Modules/_io/clinic/_iomodule.c.h @@ -407,4 +407,4 @@ _io_open_code(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec exit: return return_value; } -/*[clinic end generated code: output=f387eba3f4c0254a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7ca473c2923fa479 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index e3586af99b4653..0bc875961c58de 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -714,4 +714,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=8412b10c04259bb8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=644994e8c0c7313e input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h index a9f11838f54cd6..f8877e690bd16a 100644 --- a/Modules/_io/clinic/bytesio.c.h +++ b/Modules/_io/clinic/bytesio.c.h @@ -534,4 +534,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=a44770efbaeb80dd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b6a062e1c09a41ad input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h index 7ca3ad9c7776cf..adef48520f9441 100644 --- a/Modules/_io/clinic/fileio.c.h +++ b/Modules/_io/clinic/fileio.c.h @@ -466,4 +466,4 @@ _io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored)) #ifndef _IO_FILEIO_TRUNCATE_METHODDEF #define _IO_FILEIO_TRUNCATE_METHODDEF #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */ -/*[clinic end generated code: output=27f883807a6c29ae input=a9049054013a1b77]*/ +/*[clinic end generated code: output=70908f4244515be7 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h index 60676dceab817d..f62d1d2d800f9b 100644 --- a/Modules/_io/clinic/stringio.c.h +++ b/Modules/_io/clinic/stringio.c.h @@ -367,4 +367,4 @@ _io_StringIO_seekable(stringio *self, PyObject *Py_UNUSED(ignored)) { return _io_StringIO_seekable_impl(self); } -/*[clinic end generated code: output=533f20ae9b773126 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1f026f3ed0c015b1 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h index 80165148e54e83..98264b44bcf394 100644 --- a/Modules/_io/clinic/textio.c.h +++ b/Modules/_io/clinic/textio.c.h @@ -769,4 +769,4 @@ _io_TextIOWrapper_close(textio *self, PyObject *Py_UNUSED(ignored)) { return _io_TextIOWrapper_close_impl(self); } -/*[clinic end generated code: output=73f84b13c343b34b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fca52be090e22207 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h index c2e2231f54e8fb..0c73ffe1965324 100644 --- a/Modules/_io/clinic/winconsoleio.c.h +++ b/Modules/_io/clinic/winconsoleio.c.h @@ -407,4 +407,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored)) #ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF #endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */ -/*[clinic end generated code: output=163e934aa9b0ef16 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6be6654722cd6946 input=a9049054013a1b77]*/ diff --git a/Modules/_multiprocessing/clinic/posixshmem.c.h b/Modules/_multiprocessing/clinic/posixshmem.c.h index 4353d137906b6d..19b6223bcdbd80 100644 --- a/Modules/_multiprocessing/clinic/posixshmem.c.h +++ b/Modules/_multiprocessing/clinic/posixshmem.c.h @@ -172,4 +172,4 @@ _posixshmem_shm_unlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs #ifndef _POSIXSHMEM_SHM_UNLINK_METHODDEF #define _POSIXSHMEM_SHM_UNLINK_METHODDEF #endif /* !defined(_POSIXSHMEM_SHM_UNLINK_METHODDEF) */ -/*[clinic end generated code: output=3f6fee283d5fd0e9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=35916e2b87c96247 input=a9049054013a1b77]*/ diff --git a/Modules/_multiprocessing/clinic/semaphore.c.h b/Modules/_multiprocessing/clinic/semaphore.c.h index c537e31e775dbb..acff1f138e0844 100644 --- a/Modules/_multiprocessing/clinic/semaphore.c.h +++ b/Modules/_multiprocessing/clinic/semaphore.c.h @@ -542,4 +542,4 @@ _multiprocessing_SemLock___exit__(SemLockObject *self, PyObject *const *args, Py #ifndef _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF #define _MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF #endif /* !defined(_MULTIPROCESSING_SEMLOCK___EXIT___METHODDEF) */ -/*[clinic end generated code: output=dae57a702cc01512 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a5a9f7e97c218ccd input=a9049054013a1b77]*/ diff --git a/Modules/_sha3/clinic/sha3module.c.h b/Modules/_sha3/clinic/sha3module.c.h index 9d98933e767c24..d9669bc2f7ec26 100644 --- a/Modules/_sha3/clinic/sha3module.c.h +++ b/Modules/_sha3/clinic/sha3module.c.h @@ -193,4 +193,4 @@ _sha3_shake_128_hexdigest(SHA3object *self, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=747c3f34ddd14063 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=13d2ace9f946a33b input=a9049054013a1b77]*/ diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h index 93d6bbdbc39d00..e7da540a28b953 100644 --- a/Modules/_sqlite/clinic/connection.c.h +++ b/Modules/_sqlite/clinic/connection.c.h @@ -1532,4 +1532,4 @@ getlimit(pysqlite_Connection *self, PyObject *arg) #ifndef DESERIALIZE_METHODDEF #define DESERIALIZE_METHODDEF #endif /* !defined(DESERIALIZE_METHODDEF) */ -/*[clinic end generated code: output=f10306e10427488b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1ad2bd5ed213e62c input=a9049054013a1b77]*/ diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h index e56a140e0e8b50..e3e1df9bc76099 100644 --- a/Modules/_sqlite/clinic/cursor.c.h +++ b/Modules/_sqlite/clinic/cursor.c.h @@ -319,4 +319,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored)) { return pysqlite_cursor_close_impl(self); } -/*[clinic end generated code: output=1f82e3c9791bb9a5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a65bc830e2f2532a input=a9049054013a1b77]*/ diff --git a/Modules/_sqlite/clinic/module.c.h b/Modules/_sqlite/clinic/module.c.h index 40ccd98df90a67..fd201031997414 100644 --- a/Modules/_sqlite/clinic/module.c.h +++ b/Modules/_sqlite/clinic/module.c.h @@ -211,4 +211,4 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=39d38c6cfc455042 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=25d9a380f0311588 input=a9049054013a1b77]*/ diff --git a/Modules/_sre/clinic/sre.c.h b/Modules/_sre/clinic/sre.c.h index db3d36bf973800..445d7b454dcbee 100644 --- a/Modules/_sre/clinic/sre.c.h +++ b/Modules/_sre/clinic/sre.c.h @@ -1460,4 +1460,4 @@ _sre_SRE_Scanner_search(ScannerObject *self, PyTypeObject *cls, PyObject *const } return _sre_SRE_Scanner_search_impl(self, cls); } -/*[clinic end generated code: output=e3ba72156dd71572 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=93c2c6d8357b71ba input=a9049054013a1b77]*/ diff --git a/Modules/_ssl/clinic/cert.c.h b/Modules/_ssl/clinic/cert.c.h index be4f932b15aa12..c1289b585b7e49 100644 --- a/Modules/_ssl/clinic/cert.c.h +++ b/Modules/_ssl/clinic/cert.c.h @@ -86,4 +86,4 @@ _ssl_Certificate_get_info(PySSLCertificate *self, PyObject *Py_UNUSED(ignored)) { return _ssl_Certificate_get_info_impl(self); } -/*[clinic end generated code: output=82efada014f9b7fe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=cb3a5901a5eaae25 input=a9049054013a1b77]*/ diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h index e54dd9d9091e5a..2b5a4d732219c1 100644 --- a/Modules/cjkcodecs/clinic/multibytecodec.c.h +++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h @@ -690,4 +690,4 @@ PyDoc_STRVAR(_multibytecodec___create_codec__doc__, #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF \ {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__}, -/*[clinic end generated code: output=5f0e8dacddb0ac76 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5603da8004350df3 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 45873d15929c88..d9e89f284965ce 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -1302,4 +1302,4 @@ _asyncio_current_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=00f494214f2fd008 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=cf60801c9fc9dec6 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_bisectmodule.c.h b/Modules/clinic/_bisectmodule.c.h index 03aaa9228c61f6..7da2b8451e5236 100644 --- a/Modules/clinic/_bisectmodule.c.h +++ b/Modules/clinic/_bisectmodule.c.h @@ -433,4 +433,4 @@ _bisect_insort_left(PyObject *module, PyObject *const *args, Py_ssize_t nargs, P exit: return return_value; } -/*[clinic end generated code: output=5a7fa64bf9b262f3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=9568bd5ef3d8755e input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h index 9e36f7922c7c3a..6b7acee717e066 100644 --- a/Modules/clinic/_bz2module.c.h +++ b/Modules/clinic/_bz2module.c.h @@ -241,4 +241,4 @@ _bz2_BZ2Decompressor(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=805400e4805098ec input=a9049054013a1b77]*/ +/*[clinic end generated code: output=dae3b6dafce2b88b input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h index bec9ba865773bb..ff449c26885f2f 100644 --- a/Modules/clinic/_codecsmodule.c.h +++ b/Modules/clinic/_codecsmodule.c.h @@ -2869,4 +2869,4 @@ _codecs_lookup_error(PyObject *module, PyObject *arg) #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF #define _CODECS_CODE_PAGE_ENCODE_METHODDEF #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */ -/*[clinic end generated code: output=603da07cf8dfeb4b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5702d2568cf281c8 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_csv.c.h b/Modules/clinic/_csv.c.h index a8f31105e9067a..18718ea99fe924 100644 --- a/Modules/clinic/_csv.c.h +++ b/Modules/clinic/_csv.c.h @@ -206,4 +206,4 @@ _csv_field_size_limit(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=94374e41eb2806ee input=a9049054013a1b77]*/ +/*[clinic end generated code: output=24c339a5ead13522 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h index 0aca22bd6d49a7..b4916d849203f4 100644 --- a/Modules/clinic/_cursesmodule.c.h +++ b/Modules/clinic/_cursesmodule.c.h @@ -4313,4 +4313,4 @@ _curses_has_extended_color_support(PyObject *module, PyObject *Py_UNUSED(ignored #ifndef _CURSES_USE_DEFAULT_COLORS_METHODDEF #define _CURSES_USE_DEFAULT_COLORS_METHODDEF #endif /* !defined(_CURSES_USE_DEFAULT_COLORS_METHODDEF) */ -/*[clinic end generated code: output=27a2364193b503c1 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=eb0edaba826a7671 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_datetimemodule.c.h b/Modules/clinic/_datetimemodule.c.h index 40b393fe232c8a..cf5c2e5209eff3 100644 --- a/Modules/clinic/_datetimemodule.c.h +++ b/Modules/clinic/_datetimemodule.c.h @@ -146,4 +146,4 @@ datetime_datetime_now(PyTypeObject *type, PyObject *const *args, Py_ssize_t narg exit: return return_value; } -/*[clinic end generated code: output=42654669940e0e3a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b05a1e873735bfaf input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h index 07e92574a0be69..8300d5b0707b63 100644 --- a/Modules/clinic/_elementtree.c.h +++ b/Modules/clinic/_elementtree.c.h @@ -1218,4 +1218,4 @@ _elementtree_XMLParser__setevents(XMLParserObject *self, PyObject *const *args, exit: return return_value; } -/*[clinic end generated code: output=40767b1a98e54b60 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6dd4c38c3c5d416b input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h index d07398862018df..08a88a439a422f 100644 --- a/Modules/clinic/_functoolsmodule.c.h +++ b/Modules/clinic/_functoolsmodule.c.h @@ -101,4 +101,4 @@ _functools__lru_cache_wrapper_cache_clear(PyObject *self, PyObject *Py_UNUSED(ig { return _functools__lru_cache_wrapper_cache_clear_impl(self); } -/*[clinic end generated code: output=7e7f3bcf9ed61f23 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=abd8cb61b4a28ded input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index 117e13cea4249c..9e049a7ba83b52 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -1851,4 +1851,4 @@ _hashlib_compare_digest(PyObject *module, PyObject *const *args, Py_ssize_t narg #ifndef _HASHLIB_SCRYPT_METHODDEF #define _HASHLIB_SCRYPT_METHODDEF #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ -/*[clinic end generated code: output=b339e255db698147 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8ef8677298c6e558 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h index 453183d5cfd531..7055c0722c13b3 100644 --- a/Modules/clinic/_lzmamodule.c.h +++ b/Modules/clinic/_lzmamodule.c.h @@ -338,4 +338,4 @@ _lzma__decode_filter_properties(PyObject *module, PyObject *const *args, Py_ssiz return return_value; } -/*[clinic end generated code: output=96c1fbdada1ef232 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=411af3f12117122b input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h index 33fcef73191500..bf75b403d41159 100644 --- a/Modules/clinic/_opcode.c.h +++ b/Modules/clinic/_opcode.c.h @@ -103,4 +103,4 @@ _opcode_get_specialization_stats(PyObject *module, PyObject *Py_UNUSED(ignored)) { return _opcode_get_specialization_stats_impl(module); } -/*[clinic end generated code: output=21e3d53a659c651a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8ce722f02bc62778 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h index d937982eec5cb8..05f71e8b2a5d13 100644 --- a/Modules/clinic/_pickle.c.h +++ b/Modules/clinic/_pickle.c.h @@ -1034,4 +1034,4 @@ _pickle_loads(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec exit: return return_value; } -/*[clinic end generated code: output=a0e04b85e7bae626 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ffc0755d1d572e30 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_queuemodule.c.h b/Modules/clinic/_queuemodule.c.h index 6a10b01f7fa369..04e00cd9a36860 100644 --- a/Modules/clinic/_queuemodule.c.h +++ b/Modules/clinic/_queuemodule.c.h @@ -331,4 +331,4 @@ _queue_SimpleQueue_qsize(simplequeueobject *self, PyObject *Py_UNUSED(ignored)) exit: return return_value; } -/*[clinic end generated code: output=9a72a8d1b5767f6a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=0f6d67002fc31279 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 2d43906be14823..2d6d60635a5e86 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -1542,4 +1542,4 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje #ifndef _SSL_ENUM_CRLS_METHODDEF #define _SSL_ENUM_CRLS_METHODDEF #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ -/*[clinic end generated code: output=4d9b81fa81f520f0 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4d40a934463d0c87 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h index f51c12dd5a3e10..cb336ef0d1c75f 100644 --- a/Modules/clinic/_struct.c.h +++ b/Modules/clinic/_struct.c.h @@ -451,4 +451,4 @@ iter_unpack(PyObject *module, PyObject *const *args, Py_ssize_t nargs) return return_value; } -/*[clinic end generated code: output=f3d6e06f80368998 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1ae1e92f08bee170 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index 979bd990ae937f..a1b83733d082e7 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -2817,4 +2817,4 @@ gh_99240_double_free(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=e8211606b03d733a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b39c3b873e883049 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_testinternalcapi.c.h b/Modules/clinic/_testinternalcapi.c.h index 743b86d1aef7f1..10f4cfa8a1762b 100644 --- a/Modules/clinic/_testinternalcapi.c.h +++ b/Modules/clinic/_testinternalcapi.c.h @@ -128,4 +128,4 @@ _testinternalcapi_optimize_cfg(PyObject *module, PyObject *const *args, Py_ssize exit: return return_value; } -/*[clinic end generated code: output=efe95836482fd542 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=54c1d8f850767b40 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_testmultiphase.c.h b/Modules/clinic/_testmultiphase.c.h index 50577497714a1c..e6fc06e4ae668b 100644 --- a/Modules/clinic/_testmultiphase.c.h +++ b/Modules/clinic/_testmultiphase.c.h @@ -162,4 +162,4 @@ _testmultiphase_StateAccessType_get_count(StateAccessTypeObject *self, PyTypeObj } return _testmultiphase_StateAccessType_get_count_impl(self, cls); } -/*[clinic end generated code: output=52ea97ab2f03bb6d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=993f8dc09dc06ba0 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h index 1880a55f9314c8..49fd1b90303c19 100644 --- a/Modules/clinic/_winapi.c.h +++ b/Modules/clinic/_winapi.c.h @@ -1411,4 +1411,4 @@ _winapi_NeedCurrentDirectoryForExePath(PyObject *module, PyObject *arg) return return_value; } -/*[clinic end generated code: output=96ea65ece7912d0a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d06851f3dd125cae input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_zoneinfo.c.h b/Modules/clinic/_zoneinfo.c.h index 24ba71b316f162..e30736c13c62f1 100644 --- a/Modules/clinic/_zoneinfo.c.h +++ b/Modules/clinic/_zoneinfo.c.h @@ -372,4 +372,4 @@ zoneinfo_ZoneInfo__unpickle(PyTypeObject *type, PyTypeObject *cls, PyObject *con exit: return return_value; } -/*[clinic end generated code: output=54051388dfc408af input=a9049054013a1b77]*/ +/*[clinic end generated code: output=773d41bba1c2e11e input=a9049054013a1b77]*/ diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h index 2c60378ddca118..c003d6b9f91a84 100644 --- a/Modules/clinic/binascii.c.h +++ b/Modules/clinic/binascii.c.h @@ -795,4 +795,4 @@ binascii_b2a_qp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj return return_value; } -/*[clinic end generated code: output=ab156917c9db79d2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8ab0ef4ebb4341aa input=a9049054013a1b77]*/ diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h index 29ec5dd1c3b028..37de916d0b509a 100644 --- a/Modules/clinic/cmathmodule.c.h +++ b/Modules/clinic/cmathmodule.c.h @@ -982,4 +982,4 @@ cmath_isclose(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec exit: return return_value; } -/*[clinic end generated code: output=87f609786ef270cd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=496773db76859179 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h index cf09c88c82be32..3c96baf9fbdfd7 100644 --- a/Modules/clinic/gcmodule.c.h +++ b/Modules/clinic/gcmodule.c.h @@ -424,4 +424,4 @@ gc_get_freeze_count(PyObject *module, PyObject *Py_UNUSED(ignored)) exit: return return_value; } -/*[clinic end generated code: output=66432ac0e17fd04f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=585a2dd71d6540fb input=a9049054013a1b77]*/ diff --git a/Modules/clinic/grpmodule.c.h b/Modules/clinic/grpmodule.c.h index 86519d932e0db0..23c7b48189adfa 100644 --- a/Modules/clinic/grpmodule.c.h +++ b/Modules/clinic/grpmodule.c.h @@ -149,4 +149,4 @@ grp_getgrall(PyObject *module, PyObject *Py_UNUSED(ignored)) { return grp_getgrall_impl(module); } -/*[clinic end generated code: output=0916fdbcdeaf5d7d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=01d840a17741c197 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/itertoolsmodule.c.h b/Modules/clinic/itertoolsmodule.c.h index 44b7ff56ef65de..42993fd41e3c2e 100644 --- a/Modules/clinic/itertoolsmodule.c.h +++ b/Modules/clinic/itertoolsmodule.c.h @@ -913,4 +913,4 @@ itertools_count(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=111cbd102c2a23c9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e259907df99a7682 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/mathmodule.c.h b/Modules/clinic/mathmodule.c.h index 7021233ab87bef..9db541eafdcd0f 100644 --- a/Modules/clinic/mathmodule.c.h +++ b/Modules/clinic/mathmodule.c.h @@ -911,4 +911,4 @@ math_ulp(PyObject *module, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=a6437a3ba18c486a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=92e50ec9a1517f50 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h index 33c56f1adee473..aa90a244306e13 100644 --- a/Modules/clinic/md5module.c.h +++ b/Modules/clinic/md5module.c.h @@ -148,4 +148,4 @@ _md5_md5(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw exit: return return_value; } -/*[clinic end generated code: output=b4924c9905cc9f34 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=80c981ddde006ad4 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h index c888f7915331e6..77476e69ad598a 100644 --- a/Modules/clinic/overlapped.c.h +++ b/Modules/clinic/overlapped.c.h @@ -1262,4 +1262,4 @@ _overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const * return return_value; } -/*[clinic end generated code: output=b2e89694b8de3d00 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=9aa2e37b26469a11 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index 3e5aaab38b158b..6c5ba124cdf714 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -11922,4 +11922,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */ -/*[clinic end generated code: output=47750e0e29c8d707 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6d67970ed290be12 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h index 81feff311c41f5..d865c7769de4e4 100644 --- a/Modules/clinic/pyexpat.c.h +++ b/Modules/clinic/pyexpat.c.h @@ -498,4 +498,4 @@ pyexpat_ErrorString(PyObject *module, PyObject *arg) #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */ -/*[clinic end generated code: output=63efc62e24a7b5a7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=41d35208bf256b84 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/selectmodule.c.h b/Modules/clinic/selectmodule.c.h index 4c44d21abebb58..defd1627f162f1 100644 --- a/Modules/clinic/selectmodule.c.h +++ b/Modules/clinic/selectmodule.c.h @@ -1309,4 +1309,4 @@ select_kqueue_control(kqueue_queue_Object *self, PyObject *const *args, Py_ssize #ifndef SELECT_KQUEUE_CONTROL_METHODDEF #define SELECT_KQUEUE_CONTROL_METHODDEF #endif /* !defined(SELECT_KQUEUE_CONTROL_METHODDEF) */ -/*[clinic end generated code: output=64516114287e894d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fbf8be212c4528db input=a9049054013a1b77]*/ diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h index 7cbb4b5957c545..aa405ceffdfc37 100644 --- a/Modules/clinic/sha1module.c.h +++ b/Modules/clinic/sha1module.c.h @@ -148,4 +148,4 @@ _sha1_sha1(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject * exit: return return_value; } -/*[clinic end generated code: output=4d1293ca3472acdb input=a9049054013a1b77]*/ +/*[clinic end generated code: output=89dbd0abec290f61 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/sha2module.c.h b/Modules/clinic/sha2module.c.h index 01bbf9e31136b0..cc963322d6cc68 100644 --- a/Modules/clinic/sha2module.c.h +++ b/Modules/clinic/sha2module.c.h @@ -437,4 +437,4 @@ _sha2_sha384(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject exit: return return_value; } -/*[clinic end generated code: output=f81dacb48f3fee72 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=9ef5d7eb8b55ef36 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h index 6ec4f0e2ee4bb0..9d0797c605af80 100644 --- a/Modules/clinic/socketmodule.c.h +++ b/Modules/clinic/socketmodule.c.h @@ -91,4 +91,4 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=987155ac4b48a198 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6da43f05cfe35666 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/syslogmodule.c.h b/Modules/clinic/syslogmodule.c.h index 0fd41a15444b2f..278443fe724359 100644 --- a/Modules/clinic/syslogmodule.c.h +++ b/Modules/clinic/syslogmodule.c.h @@ -254,4 +254,4 @@ syslog_LOG_UPTO(PyObject *module, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=3b1bdb16565b8fda input=a9049054013a1b77]*/ +/*[clinic end generated code: output=41ee4523551d3c85 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h index b3f7e4ad877383..2e742482793ab8 100644 --- a/Modules/clinic/zlibmodule.c.h +++ b/Modules/clinic/zlibmodule.c.h @@ -1129,4 +1129,4 @@ zlib_crc32(PyObject *module, PyObject *const *args, Py_ssize_t nargs) #ifndef ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF #define ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF #endif /* !defined(ZLIB_DECOMPRESS___DEEPCOPY___METHODDEF) */ -/*[clinic end generated code: output=57ff7b511ab23132 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=bc8f0bee448aaf8c input=a9049054013a1b77]*/ diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h index f5c6d368371f79..339c284f5264d0 100644 --- a/Objects/clinic/bytearrayobject.c.h +++ b/Objects/clinic/bytearrayobject.c.h @@ -1287,4 +1287,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) { return bytearray_sizeof_impl(self); } -/*[clinic end generated code: output=022698e8b0faa272 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=42205cdd3901b063 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h index 6750c031f878bd..66146873dc3b9d 100644 --- a/Objects/clinic/bytesobject.c.h +++ b/Objects/clinic/bytesobject.c.h @@ -1063,4 +1063,4 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=31a9e4af85562612 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=78e997f348e46914 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h index 55dacf7fb8979d..65f61745282c9a 100644 --- a/Objects/clinic/codeobject.c.h +++ b/Objects/clinic/codeobject.c.h @@ -488,4 +488,4 @@ code__varname_from_oparg(PyCodeObject *self, PyObject *const *args, Py_ssize_t n exit: return return_value; } -/*[clinic end generated code: output=f1fab6e71c785182 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=25dd144547496ac7 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h index 9f31d3fadd6010..a2d33df47ff787 100644 --- a/Objects/clinic/complexobject.c.h +++ b/Objects/clinic/complexobject.c.h @@ -160,4 +160,4 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=52e85a1e258425d6 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d0f5c0b2b1435d88 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/descrobject.c.h b/Objects/clinic/descrobject.c.h index a7e38cacc80423..2f9811fd1d1576 100644 --- a/Objects/clinic/descrobject.c.h +++ b/Objects/clinic/descrobject.c.h @@ -167,4 +167,4 @@ property_init(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=8dc1ddfcf764ac8e input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e28750d823275682 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/enumobject.c.h b/Objects/clinic/enumobject.c.h index 16275d59f132c4..21f8f05380adfe 100644 --- a/Objects/clinic/enumobject.c.h +++ b/Objects/clinic/enumobject.c.h @@ -107,4 +107,4 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=aba0ddbeab1601e3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d26b8c4f8d78cd22 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/funcobject.c.h b/Objects/clinic/funcobject.c.h index 9fde46fab892b8..0a7c61bead0096 100644 --- a/Objects/clinic/funcobject.c.h +++ b/Objects/clinic/funcobject.c.h @@ -104,4 +104,4 @@ func_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=777cead7b1f6fad3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=748855055a18b803 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h index 9a1025335644e3..e26e395cd446ac 100644 --- a/Objects/clinic/listobject.c.h +++ b/Objects/clinic/listobject.c.h @@ -383,4 +383,4 @@ list___reversed__(PyListObject *self, PyObject *Py_UNUSED(ignored)) { return list___reversed___impl(self); } -/*[clinic end generated code: output=2ca109d8acc775bc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c6598659fa1e57f4 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/longobject.c.h b/Objects/clinic/longobject.c.h index 0ddbcebb59b768..cf9812c82cf1f9 100644 --- a/Objects/clinic/longobject.c.h +++ b/Objects/clinic/longobject.c.h @@ -484,4 +484,4 @@ int_is_integer(PyObject *self, PyObject *Py_UNUSED(ignored)) { return int_is_integer_impl(self); } -/*[clinic end generated code: output=cfdf35d916158d4f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b52d9040db6d060a input=a9049054013a1b77]*/ diff --git a/Objects/clinic/memoryobject.c.h b/Objects/clinic/memoryobject.c.h index 623faee323de2b..13b773514a18f8 100644 --- a/Objects/clinic/memoryobject.c.h +++ b/Objects/clinic/memoryobject.c.h @@ -356,4 +356,4 @@ memoryview_hex(PyMemoryViewObject *self, PyObject *const *args, Py_ssize_t nargs exit: return return_value; } -/*[clinic end generated code: output=a832f2fc44e4794c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=03ab7112739fd873 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/moduleobject.c.h b/Objects/clinic/moduleobject.c.h index e51f3c3a58474f..72e14d165c2e56 100644 --- a/Objects/clinic/moduleobject.c.h +++ b/Objects/clinic/moduleobject.c.h @@ -77,4 +77,4 @@ module___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=2f897c9e4721f03f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=39e7efc6b71444f2 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/odictobject.c.h b/Objects/clinic/odictobject.c.h index 570fd6115a701c..8d224f6bb5675d 100644 --- a/Objects/clinic/odictobject.c.h +++ b/Objects/clinic/odictobject.c.h @@ -332,4 +332,4 @@ OrderedDict_move_to_end(PyODictObject *self, PyObject *const *args, Py_ssize_t n exit: return return_value; } -/*[clinic end generated code: output=76d85a9162d62ca8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=be6a07fd2c7793cf input=a9049054013a1b77]*/ diff --git a/Objects/clinic/structseq.c.h b/Objects/clinic/structseq.c.h index 2299ee090d6731..7eaa62876112c8 100644 --- a/Objects/clinic/structseq.c.h +++ b/Objects/clinic/structseq.c.h @@ -62,4 +62,4 @@ structseq_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=802d5663c7d01024 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4eaaa966ea62b951 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h index 914b090cffaed0..1d85a1a9be94b9 100644 --- a/Objects/clinic/unicodeobject.c.h +++ b/Objects/clinic/unicodeobject.c.h @@ -1497,4 +1497,4 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=05d942840635dadf input=a9049054013a1b77]*/ +/*[clinic end generated code: output=88c7e2d8abcd79b3 input=a9049054013a1b77]*/ diff --git a/Objects/stringlib/clinic/transmogrify.h.h b/Objects/stringlib/clinic/transmogrify.h.h index f126ceb896726f..9c6f0ec02f72fb 100644 --- a/Objects/stringlib/clinic/transmogrify.h.h +++ b/Objects/stringlib/clinic/transmogrify.h.h @@ -278,4 +278,4 @@ stringlib_zfill(PyObject *self, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=d44a269805f6739e input=a9049054013a1b77]*/ +/*[clinic end generated code: output=95246ee96b5be347 input=a9049054013a1b77]*/ diff --git a/PC/clinic/_testconsole.c.h b/PC/clinic/_testconsole.c.h index 6a54ea8401b53c..7bc45fbd9c2529 100644 --- a/PC/clinic/_testconsole.c.h +++ b/PC/clinic/_testconsole.c.h @@ -140,4 +140,4 @@ _testconsole_read_output(PyObject *module, PyObject *const *args, Py_ssize_t nar #ifndef _TESTCONSOLE_READ_OUTPUT_METHODDEF #define _TESTCONSOLE_READ_OUTPUT_METHODDEF #endif /* !defined(_TESTCONSOLE_READ_OUTPUT_METHODDEF) */ -/*[clinic end generated code: output=208c72e2c873555b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7f7a7ced894ef139 input=a9049054013a1b77]*/ diff --git a/PC/clinic/_wmimodule.cpp.h b/PC/clinic/_wmimodule.cpp.h index f1af43a4e696d3..65534aaa55f2d6 100644 --- a/PC/clinic/_wmimodule.cpp.h +++ b/PC/clinic/_wmimodule.cpp.h @@ -72,4 +72,4 @@ _wmi_exec_query(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj exit: return return_value; } -/*[clinic end generated code: output=7fdf0c0579ddb566 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ae9f91740050349c input=a9049054013a1b77]*/ diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h index 2c99fab42f7c90..c834f202ef7d53 100644 --- a/PC/clinic/winreg.c.h +++ b/PC/clinic/winreg.c.h @@ -1795,4 +1795,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg) #ifndef WINREG_QUERYREFLECTIONKEY_METHODDEF #define WINREG_QUERYREFLECTIONKEY_METHODDEF #endif /* !defined(WINREG_QUERYREFLECTIONKEY_METHODDEF) */ -/*[clinic end generated code: output=715db416dc1321ee input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6bafe51fb03dff68 input=a9049054013a1b77]*/ diff --git a/PC/clinic/winsound.c.h b/PC/clinic/winsound.c.h index 1350f531ed3279..9b5ec859d4657a 100644 --- a/PC/clinic/winsound.c.h +++ b/PC/clinic/winsound.c.h @@ -206,4 +206,4 @@ winsound_MessageBeep(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=f70b7730127208d8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8cdb0d6fa5fa9b59 input=a9049054013a1b77]*/ diff --git a/Python/clinic/Python-tokenize.c.h b/Python/clinic/Python-tokenize.c.h index 343c9d6567e60e..6faa6a2767c33b 100644 --- a/Python/clinic/Python-tokenize.c.h +++ b/Python/clinic/Python-tokenize.c.h @@ -67,4 +67,4 @@ tokenizeriter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=8c2c09f651961986 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1b0d1505c46eb1d7 input=a9049054013a1b77]*/ diff --git a/Python/clinic/_warnings.c.h b/Python/clinic/_warnings.c.h index eed35bd1710bf2..dd46143af09aff 100644 --- a/Python/clinic/_warnings.c.h +++ b/Python/clinic/_warnings.c.h @@ -246,4 +246,4 @@ warnings_filters_mutated(PyObject *module, PyObject *Py_UNUSED(ignored)) { return warnings_filters_mutated_impl(module); } -/*[clinic end generated code: output=20429719d7223bdc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b24d67f1541ded66 input=a9049054013a1b77]*/ diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index fb09d4a6ae1d57..e311179691d115 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -1409,4 +1409,4 @@ builtin_issubclass(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=84a04e7446debf58 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6297f898ff2fada9 input=a9049054013a1b77]*/ diff --git a/Python/clinic/import.c.h b/Python/clinic/import.c.h index e6161e474c1eed..9caff131ff99f5 100644 --- a/Python/clinic/import.c.h +++ b/Python/clinic/import.c.h @@ -648,4 +648,4 @@ _imp_source_hash(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb #ifndef _IMP_EXEC_DYNAMIC_METHODDEF #define _IMP_EXEC_DYNAMIC_METHODDEF #endif /* !defined(_IMP_EXEC_DYNAMIC_METHODDEF) */ -/*[clinic end generated code: output=b18d46e0036eff49 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=df66b512263fdd7d input=a9049054013a1b77]*/ diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h index 0579795aa44b56..d307dd64dc4577 100644 --- a/Python/clinic/sysmodule.c.h +++ b/Python/clinic/sysmodule.c.h @@ -1387,4 +1387,4 @@ sys__getframemodulename(PyObject *module, PyObject *const *args, Py_ssize_t narg #ifndef SYS_GETANDROIDAPILEVEL_METHODDEF #define SYS_GETANDROIDAPILEVEL_METHODDEF #endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */ -/*[clinic end generated code: output=5c761f14326ced54 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e2aaf2c3b936fc52 input=a9049054013a1b77]*/ diff --git a/Python/clinic/traceback.c.h b/Python/clinic/traceback.c.h index 35f613c3665c7b..b6a9f6982417e6 100644 --- a/Python/clinic/traceback.c.h +++ b/Python/clinic/traceback.c.h @@ -78,4 +78,4 @@ tb_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=7bc9927e362fdfb7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=36980a501a417f46 input=a9049054013a1b77]*/