Add _Py_TryIncref

Include/internal/pycore_object.h

@@ -527,6 +527,21 @@ _PyObject_SetMaybeWeakref(PyObject *op)
 
 #endif
 
+/* Tries to incref op and returns 1 if successful or 0 otherwise. */
+static inline int
+_Py_TryIncref(PyObject *op)
+{
+#ifdef Py_GIL_DISABLED
+    return _Py_TryIncrefFast(op) || _Py_TryIncRefShared(op);
+#else
+    if (Py_REFCNT(op) > 0) {
+        Py_INCREF(op);
+        return 1;
+    }
+    return 0;
+#endif
+}
+
 #ifdef Py_REF_DEBUG
 extern void _PyInterpreterState_FinalizeRefTotal(PyInterpreterState *);
 extern void _Py_FinalizeRefTotal(_PyRuntimeState *);

Include/internal/pycore_weakref.h

@@ -57,26 +57,20 @@ static inline PyObject* _PyWeakref_GET_REF(PyObject *ref_obj)
         return NULL;
     }
 
-#if !defined(Py_GIL_DISABLED)
-    if (_is_dead(obj)) {
-        return NULL;
-    }
-    assert(Py_REFCNT(obj) > 0);
-    return Py_NewRef(obj);
-#else
     LOCK_WEAKREFS(obj);
+#ifdef Py_GIL_DISABLED
     if (ref->wr_object == Py_None) {
         // clear_weakref() was called
         UNLOCK_WEAKREFS(obj);
         return NULL;
     }
-    if (_Py_TryIncrefCompare(&obj, obj)) {
+#endif
+    if (_Py_TryIncref(obj)) {
         UNLOCK_WEAKREFS(obj);
         return obj;
     }
     UNLOCK_WEAKREFS(obj);
     return NULL;
-#endif
 }
 
 static inline int _PyWeakref_IS_DEAD(PyObject *ref_obj)

Modules/_weakref.c

@@ -100,7 +100,7 @@ _weakref_getweakrefs(PyObject *module, PyObject *object)
     PyWeakReference *current = *list;
     // Weakrefs may be added or removed since the count was computed.
     while (num_added < count && current != NULL) {
-        if (_Py_TryIncrefCompare((PyObject**) &current, (PyObject *) current)) {
+        if (_Py_TryIncref((PyObject *) current)) {
             PyList_SET_ITEM(result, num_added, current);
             num_added++;
         }

Objects/weakrefobject.c

@@ -358,7 +358,7 @@ try_reuse_basic_ref(PyWeakReference *list, PyTypeObject *type, PyObject *callbac
     }
 
 #ifdef Py_GIL_DISABLED
-    if (cand != NULL && !_Py_TryIncrefCompare((PyObject **) &cand, (PyObject *) cand)) {
+    if (cand != NULL && !_Py_TryIncref((PyObject *) cand)) {
         cand = NULL;
     }
 #else
@@ -1077,7 +1077,7 @@ PyObject_ClearWeakRefs(PyObject *object)
         PyWeakReference *cur = *list;
         if (cur != NULL) {
             clear_weakref_lock_held(cur, &callback);
-            if (_Py_TryIncrefCompare((PyObject **) &cur, (PyObject *) cur)) {
+            if (_Py_TryIncref((PyObject *) cur)) {
                 assert(num_items / 2 < num_weakrefs);
                 PyTuple_SET_ITEM(tuple, num_items, (PyObject *) cur);
                 PyTuple_SET_ITEM(tuple, num_items + 1, callback);