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
Clean up the error case in _PyStructSequence_InitBuiltinWithFlags().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 1, 2023
commit 76d055428477ebf7562134c5498eab6e11bc4422
28 changes: 17 additions & 11 deletions Objects/structseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,41 +506,47 @@ _PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,
PyStructSequence_Desc *desc,
unsigned long tp_flags)
{
PyMemberDef *members = NULL;

if (type->tp_flags & Py_TPFLAGS_READY) {
assert((type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
if (_PyStaticType_InitBuiltin(type) < 0) {
goto failed_init_builtin;
PyErr_Format(PyExc_RuntimeError,
"Can't initialize builtin type %s",
desc->name);
goto error;
}
return 0;
}

PyMemberDef *members;
Py_ssize_t n_members, n_unnamed_members;

n_members = count_members(desc, &n_unnamed_members);
members = initialize_members(desc, n_members, n_unnamed_members);
if (members == NULL) {
return -1;
goto error;
}
initialize_static_fields(type, desc, members, tp_flags);

Py_INCREF(type); // XXX It should be immortal.
if (_PyStaticType_InitBuiltin(type) < 0) {
PyMem_Free(members);
goto failed_init_builtin;
PyErr_Format(PyExc_RuntimeError,
"Can't initialize builtin type %s",
desc->name);
goto error;
}

if (initialize_structseq_dict(
desc, type->tp_dict, n_members, n_unnamed_members) < 0) {
PyMem_Free(members);
return -1;
goto error;
}

return 0;

failed_init_builtin:
PyErr_Format(PyExc_RuntimeError,
"Can't initialize builtin type %s",
desc->name);
error:
if (members != NULL) {
PyMem_Free(members);
}
return -1;
}

Expand Down