Skip to content

gh-132713: Fix typing.Union[index] race condition #132802

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
merged 8 commits into from
Apr 23, 2025
Merged

gh-132713: Fix typing.Union[index] race condition #132802

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
208f247
gh-132713: Fix typing.Union[index] race condition
vstinner Apr 22, 2025
d81ec9b
Add comment
vstinner Apr 22, 2025
d93396a
Add comment about the micro-optimization
vstinner Apr 22, 2025
f12f905
Fix also union_parameters()
vstinner Apr 22, 2025
a7b74a3
Use FT_ATOMIC to load/store the pointer
vstinner Apr 22, 2025
27da04d
Remove the optimization
vstinner Apr 23, 2025
26c9a32
Remove empty line
vstinner Apr 23, 2025
8eb3cbd
Merge branch 'main' into union_getitem
vstinner Apr 23, 2025
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
29 changes: 19 additions & 10 deletions Objects/unionobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,17 +322,29 @@ static PyMemberDef union_members[] = {
{0}
};

static PyObject *
union_getitem(PyObject *self, PyObject *item)
// Populate __parameters__ if needed.
static int
union_init_parameters(unionobject *alias)
{
unionobject *alias = (unionobject *)self;
// Populate __parameters__ if needed.
int result = 0;
Py_BEGIN_CRITICAL_SECTION(alias);
if (alias->parameters == NULL) {
alias->parameters = _Py_make_parameters(alias->args);
if (alias->parameters == NULL) {
return NULL;
result = -1;
}
}
Py_END_CRITICAL_SECTION();
return result;
}

static PyObject *
union_getitem(PyObject *self, PyObject *item)
{
unionobject *alias = (unionobject *)self;
if (union_init_parameters(alias) < 0) {
return NULL;
}

PyObject *newargs = _Py_subs_parameters(self, alias->args, alias->parameters, item);
if (newargs == NULL) {
Expand All @@ -352,11 +364,8 @@ static PyObject *
union_parameters(PyObject *self, void *Py_UNUSED(unused))
{
unionobject *alias = (unionobject *)self;
if (alias->parameters == NULL) {
alias->parameters = _Py_make_parameters(alias->args);
if (alias->parameters == NULL) {
return NULL;
}
if (union_init_parameters(alias) < 0) {
return NULL;
}
return Py_NewRef(alias->parameters);
}
Expand Down
Loading