Fixups

mpage · mpage · commit 0021bc5101ff · 2024-03-27T11:33:31.000-07:00
diff --git a/Include/internal/pycore_weakref.h b/Include/internal/pycore_weakref.h
@@ -53,6 +53,7 @@ static inline PyObject* _PyWeakref_GET_REF(PyObject *ref_obj)
         // clear_weakref() was called
         return NULL;
     }
+
     if (_is_dead(obj)) {
         return NULL;
     }
diff --git a/Modules/_weakref.c b/Modules/_weakref.c
@@ -32,6 +32,7 @@ _weakref_getweakrefcount_impl(PyObject *module, PyObject *object)
     return _PyWeakref_GetWeakrefCountThreadsafe(object);
 }
 
+
 static int
 is_dead_weakref(PyObject *value)
 {
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -54,9 +54,7 @@
  * them, but we only hold borrowed references and they may also be destroyed
  * concurrently.
  *
- * We can probably solve this by using QSBR to ensure that the memory backing
- * either the weakref or the referenced object is not freed until we're ready,
- * but for now we've chosen to work around it using a few different strategies:
+ * For now we've chosen to address this in a straightforward way:
  *
  * - The weakref's hash is protected using the weakref's per-object lock.
  * - The other mutable is protected by a striped lock owned by the interpreter.
@@ -79,6 +77,7 @@ Py_ssize_t
 _PyWeakref_GetWeakrefCount(PyWeakReference *head)
 {
     Py_ssize_t count = 0;
+
     while (head != NULL) {
         ++count;
         head = head->wr_next;
@@ -468,6 +467,12 @@ is_basic_proxy(PyWeakReference *proxy)
     return (proxy->wr_callback == NULL) && PyWeakref_CheckProxy(proxy);
 }
 
+static int
+is_basic_ref_or_proxy(PyWeakReference *wr)
+{
+    return is_basic_ref(wr) || is_basic_proxy(wr);
+}
+
 /* Return the node that `newref` should be inserted after or NULL if `newref`
  * should be inserted at the head of the list.
  */
@@ -1119,13 +1124,10 @@ PyObject_ClearWeakRefs(PyObject *object)
     for (int done = 0; !done;) {
         PyObject *callback = NULL;
         LOCK_WEAKREFS(object);
-        if (*list != NULL && (*list)->wr_callback == NULL) {
+        if (*list != NULL && is_basic_ref_or_proxy(*list)) {
             clear_weakref_lock_held(*list, &callback);
-            done = (*list == NULL);
-        }
-        else {
-            done = 1;
         }
+        done = (*list == NULL) || !is_basic_ref_or_proxy(*list);
         UNLOCK_WEAKREFS(object);
         Py_XDECREF(callback);
     }
@@ -1158,9 +1160,7 @@ PyObject_ClearWeakRefs(PyObject *object)
                 callback = NULL;
             }
         }
-        else {
-            done = 1;
-        }
+        done = (*list == NULL);
         UNLOCK_WEAKREFS(object);
 
         Py_XDECREF(callback);

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ static inline PyObject* _PyWeakref_GET_REF(PyObject *ref_obj)`
`53`	`53`	`// clear_weakref() was called`
`54`	`54`	`return NULL;`
`55`	`55`	`}`
	`56`	`+`
`56`	`57`	`if (_is_dead(obj)) {`
`57`	`58`	`return NULL;`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ _weakref_getweakrefcount_impl(PyObject module, PyObject object)`
`32`	`32`	`return _PyWeakref_GetWeakrefCountThreadsafe(object);`
`33`	`33`	`}`
`34`	`34`
	`35`	`+`
`35`	`36`	`static int`
`36`	`37`	`is_dead_weakref(PyObject *value)`
`37`	`38`	`{`