Merge implementation of try_reuse_basic_ref

mpage · mpage · commit fece88d7f003 · 2024-03-29T14:14:54.000-07:00
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -353,15 +353,10 @@ try_reuse_basic_ref(PyWeakReference *list, PyTypeObject *type,
         cand = proxy;
     }
 
-#ifdef Py_GIL_DISABLED
-    if (cand != NULL && !_Py_TryIncref((PyObject *) cand)) {
-        cand = NULL;
+    if (cand != NULL && _Py_TryIncref((PyObject *) cand)) {
+        return cand;
     }
-#else
-    Py_XINCREF(cand);
-#endif
-
-    return cand;
+    return NULL;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -353,15 +353,10 @@ try_reuse_basic_ref(PyWeakReference list, PyTypeObject type,`
`353`	`353`	`cand = proxy;`
`354`	`354`	`}`
`355`	`355`
`356`		`-#ifdef Py_GIL_DISABLED`
`357`		`- if (cand != NULL && !_Py_TryIncref((PyObject *) cand)) {`
`358`		`- cand = NULL;`
	`356`	`+ if (cand != NULL && _Py_TryIncref((PyObject *) cand)) {`
	`357`	`+ return cand;`
`359`	`358`	`}`
`360`		`-#else`
`361`		`- Py_XINCREF(cand);`
`362`		`-#endif`
`363`		`-`
`364`		`- return cand;`
	`359`	`+ return NULL;`
`365`	`360`	`}`
`366`	`361`
`367`	`362`	`static int`