Skip to content

gh-84436: Immortalize in _PyStructSequence_InitBuiltinWithFlags() #104054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 7 commits into from
May 1, 2023
Merged

gh-84436: Immortalize in _PyStructSequence_InitBuiltinWithFlags() #104054

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9bdaef
Do not call count_members() in initialize_members().
gaogaotiantian Apr 28, 2023
3478a73
_PyStructSequence_FiniType() -> _PyStructSequence_FiniBuiltin().
ericsnowcurrently May 1, 2023
76d0554
Clean up the error case in _PyStructSequence_InitBuiltinWithFlags().
ericsnowcurrently May 1, 2023
6f4f37d
Clean up _PyStructSequence_InitBuiltinWithFlags().
ericsnowcurrently May 1, 2023
d52578f
Un-initialize the builtin structseq types.
ericsnowcurrently Apr 25, 2023
39f09b0
Immortalize in _PyStructSequence_InitBuiltinWithFlags().
ericsnowcurrently Apr 13, 2023
2abdc79
Fix _PyStructSequence_FiniBuiltin().
ericsnowcurrently May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Un-initialize the builtin structseq types.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 1, 2023
commit d52578fd645693e3939fc9456fdf7b4eba9dd2f0
15 changes: 12 additions & 3 deletions Objects/structseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,10 @@ _PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,

int initialized = 1;
if ((type->tp_flags & Py_TPFLAGS_READY) == 0) {
assert(type->tp_name == NULL);
assert(type->tp_members == NULL);
assert(type->tp_base == NULL);

members = initialize_members(desc, n_members, n_unnamed_members);
if (members == NULL) {
goto error;
Expand All @@ -523,6 +527,10 @@ _PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,
}
#ifndef NDEBUG
else {
// Ensure that the type was initialized.
assert(type->tp_name != NULL);
assert(type->tp_members != NULL);
assert(type->tp_base == &PyTuple_Type);
assert((type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
}
#endif
Expand Down Expand Up @@ -613,18 +621,19 @@ _PyStructSequence_FiniBuiltin(PyTypeObject *type)
// Undo _PyStructSequence_InitBuiltinWithFlags().
type->tp_name = NULL;
PyMem_Free(type->tp_members);
type->tp_members = NULL;

_PyStaticType_Dealloc(type);
assert(Py_REFCNT(type) == 1);
// Undo Py_INCREF(type) of _PyStructSequence_InitType().
// Undo Py_INCREF(type) of _PyStructSequence_InitBuiltinWithFlags().
// Don't use Py_DECREF(): static type must not be deallocated
Py_SET_REFCNT(type, 0);
#ifdef Py_REF_DEBUG
_Py_DecRefTotal(_PyInterpreterState_GET());
#endif

// Make sure that _PyStructSequence_InitType() will initialize
// the type again
// Make sure that _PyStructSequence_InitBuiltinWithFlags()
// will initialize the type again.
assert(Py_REFCNT(type) == 0);
assert(type->tp_name == NULL);
}
Expand Down