python
diff --git a/‎Include/internal/pycore_weakref.h
Lines changed: 1 addition & 5 deletions b/‎Include/internal/pycore_weakref.h
Lines changed: 1 addition & 5 deletions
diff --git a/‎Modules/_weakref.c
Lines changed: 2 additions & 5 deletions b/‎Modules/_weakref.c
Lines changed: 2 additions & 5 deletions
diff --git a/‎Objects/weakrefobject.c
Lines changed: 9 additions & 16 deletions b/‎Objects/weakrefobject.c
Lines changed: 9 additions & 16 deletions
@@ -111,11 +111,7 @@ static inline int _PyWeakref_IS_DEAD(PyObject *ref_obj)
     return ret;
 }
 
-// NB: In free-threaded builds the weakref list lock for the referenced object
-// must be held around calls to this function.
-extern Py_ssize_t _PyWeakref_GetWeakrefCount(PyWeakReference *head);
-
-extern Py_ssize_t _PyWeakref_GetWeakrefCountThreadsafe(PyObject *obj);
+extern Py_ssize_t _PyWeakref_GetWeakrefCount(PyObject *obj);
 
 // Clear all the weak references to obj but leave their callbacks uncalled and
 // intact.
 
@@ -26,10 +26,7 @@ static Py_ssize_t
 _weakref_getweakrefcount_impl(PyObject *module, PyObject *object)
 /*[clinic end generated code: output=301806d59558ff3e input=7d4d04fcaccf64d5]*/
 {
-    if (!_PyType_SUPPORTS_WEAKREFS(Py_TYPE(object))) {
-        return 0;
-    }
-    return _PyWeakref_GetWeakrefCountThreadsafe(object);
+    return _PyWeakref_GetWeakrefCount(object);
 }
 
 
@@ -90,7 +87,7 @@ _weakref_getweakrefs(PyObject *module, PyObject *object)
     }
 
     PyWeakReference **list = GET_WEAKREFS_LISTPTR(object);
-    Py_ssize_t count = _PyWeakref_GetWeakrefCountThreadsafe(object);
+    Py_ssize_t count = _PyWeakref_GetWeakrefCount(object);
 
     PyObject *result = PyList_New(count);
     if (result == NULL) {
 
@@ -39,26 +39,19 @@
 
 
 Py_ssize_t
-_PyWeakref_GetWeakrefCount(PyWeakReference *head)
+_PyWeakref_GetWeakrefCount(PyObject *obj)
 {
-    Py_ssize_t count = 0;
+    if (!_PyType_SUPPORTS_WEAKREFS(Py_TYPE(obj))) {
+        return 0;
+    }
 
+    LOCK_WEAKREFS(obj);
+    Py_ssize_t count = 0;
+    PyWeakReference *head = *GET_WEAKREFS_LISTPTR(obj);
     while (head != NULL) {
         ++count;
         head = head->wr_next;
     }
-    return count;
-}
-
-Py_ssize_t
-_PyWeakref_GetWeakrefCountThreadsafe(PyObject *obj)
-{
-    if (!_PyType_SUPPORTS_WEAKREFS(Py_TYPE(obj))) {
-        return 0;
-    }
-    Py_ssize_t count;
-    LOCK_WEAKREFS(obj);
-    count = _PyWeakref_GetWeakrefCount(*GET_WEAKREFS_LISTPTR(obj));
     UNLOCK_WEAKREFS(obj);
     return count;
 }
@@ -1114,7 +1107,7 @@ PyObject_ClearWeakRefs(PyObject *object)
     }
 
     /* Deal with non-canonical (subtypes or refs with callbacks) references. */
-    Py_ssize_t num_weakrefs = _PyWeakref_GetWeakrefCountThreadsafe(object);
+    Py_ssize_t num_weakrefs = _PyWeakref_GetWeakrefCount(object);
     if (num_weakrefs == 0) {
         return;
     }
@@ -1168,7 +1161,7 @@ PyObject_ClearWeakRefs(PyObject *object)
     }
     if (*list != NULL) {
         PyWeakReference *current = *list;
-        Py_ssize_t count = _PyWeakref_GetWeakrefCount(current);
+        Py_ssize_t count = _PyWeakref_GetWeakrefCount(object);
         PyObject *exc = PyErr_GetRaisedException();
 
         if (count == 1) {
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@ static Py_ssize_t`
`26`	`26`	`_weakref_getweakrefcount_impl(PyObject module, PyObject object)`
`27`	`27`	`/[clinic end generated code: output=301806d59558ff3e input=7d4d04fcaccf64d5]/`
`28`	`28`	`{`
`29`		`- if (!_PyType_SUPPORTS_WEAKREFS(Py_TYPE(object))) {`
`30`		`- return 0;`
`31`		`- }`
`32`		`- return _PyWeakref_GetWeakrefCountThreadsafe(object);`
	`29`	`+ return _PyWeakref_GetWeakrefCount(object);`
`33`	`30`	`}`
`34`	`31`
`35`	`32`
`@@ -90,7 +87,7 @@ _weakref_getweakrefs(PyObject module, PyObject object)`
`90`	`87`	`}`
`91`	`88`
`92`	`89`	`PyWeakReference **list = GET_WEAKREFS_LISTPTR(object);`
`93`		`- Py_ssize_t count = _PyWeakref_GetWeakrefCountThreadsafe(object);`
	`90`	`+ Py_ssize_t count = _PyWeakref_GetWeakrefCount(object);`
`94`	`91`
`95`	`92`	`PyObject *result = PyList_New(count);`
`96`	`93`	`if (result == NULL) {`