Make _PyStaticType_ClearWeakRefs thread-safe

mpage · mpage · commit 6d00f51a860c · 2024-03-22T12:29:13.000-07:00
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -1069,10 +1069,12 @@ _PyStaticType_ClearWeakRefs(PyInterpreterState *interp, PyTypeObject *type)
 {
     static_builtin_state *state = _PyStaticType_GetState(interp, type);
     PyObject **list = _PyStaticType_GET_WEAKREFS_LISTPTR(state);
+    Py_BEGIN_CRITICAL_SECTION(type);
     while (*list != NULL) {
         /* Note that clear_weakref() pops the first ref off the type's
            weaklist before clearing its wr_object and wr_callback.
            That is how we're able to loop over the list. */
         clear_weakref((PyWeakReference *)*list);
     }
+    Py_END_CRITICAL_SECTION();
 }

Original file line number	Diff line number	Diff line change
`@@ -1069,10 +1069,12 @@ _PyStaticType_ClearWeakRefs(PyInterpreterState interp, PyTypeObject type)`
`1069`	`1069`	`{`
`1070`	`1070`	`static_builtin_state *state = _PyStaticType_GetState(interp, type);`
`1071`	`1071`	`PyObject **list = _PyStaticType_GET_WEAKREFS_LISTPTR(state);`
	`1072`	`+ Py_BEGIN_CRITICAL_SECTION(type);`
`1072`	`1073`	`while (*list != NULL) {`
`1073`	`1074`	`/* Note that clear_weakref() pops the first ref off the type's`
`1074`	`1075`	`weaklist before clearing its wr_object and wr_callback.`
`1075`	`1076`	`That is how we're able to loop over the list. */`
`1076`	`1077`	`clear_weakref((PyWeakReference )list);`
`1077`	`1078`	`}`
	`1079`	`+ Py_END_CRITICAL_SECTION();`
`1078`	`1080`	`}`