Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions Lib/test/test_free_threading/test_types.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import unittest
from typing import TypeVar
from test.support import threading_helper

threading_helper.requires_working_threading(module=True)


class TestGenericAlias(unittest.TestCase):
def test_parameters_race(self):
# gh-153298

T = TypeVar('T')
slot = [list[T]]

def access():
for _ in range(2000):
try:
_ = slot[0].__parameters__
except Exception:
pass

def refresh():
for _ in range(2000):
slot[0] = list[T]

threading_helper.run_concurrently([
*[access for _ in range(6)],
*[refresh for _ in range(2)],
])


if __name__ == "__main__":
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes a data race in :class:`types.GenericAlias` ``__parameters__``
initialization on free-threading builds.
12 changes: 11 additions & 1 deletion Objects/genericaliasobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ static PyMemberDef ga_members[] = {
};

static PyObject *
ga_parameters(PyObject *self, void *unused)
ga_parameters_lock_held(PyObject *self)
{
gaobject *alias = (gaobject *)self;
if (alias->parameters == NULL) {
Expand All @@ -853,6 +853,16 @@ ga_parameters(PyObject *self, void *unused)
return Py_NewRef(alias->parameters);
}

static PyObject *
ga_parameters(PyObject *self, void *unused)
{
PyObject *result;
Py_BEGIN_CRITICAL_SECTION(self);
result = ga_parameters_lock_held(self);
Py_END_CRITICAL_SECTION();
return result;
}

static PyObject *
ga_unpacked_tuple_args(PyObject *self, void *unused)
{
Expand Down
Loading