python
diff --git a/‎Include/internal/pycore_object.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_object.h
+3-4Lines changed: 3 additions & 4 deletions b/‎Include/internal/pycore_object.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_object.h
+3-4Lines changed: 3 additions & 4 deletions
@@ -430,7 +430,7 @@ _Py_TryIncRefShared(PyObject *op)
 
 /* Tries to incref the object op and ensures that *src still points to it. */
 static inline int
-_Py_TryAcquireObject(PyObject **src, PyObject *op)
+_Py_TryIncref(PyObject **src, PyObject *op)
 {
     if (_Py_TryIncrefFast(op)) {
         return 1;
@@ -465,13 +465,13 @@ _Py_XGetRef(PyObject **ptr)
 /* Attempts to loads and increfs an object from ptr. Returns NULL
    on failure, which may be due to a NULL value or a concurrent update. */
 static inline PyObject *
-_Py_TryXFetchRef(PyObject **ptr)
+_Py_TryXGetRef(PyObject **ptr)
 {
     PyObject *value = _Py_atomic_load_ptr(ptr);
     if (value == NULL) {
         return value;
     }
-    if (_Py_TryAcquireObject(ptr, value)) {
+    if (_Py_TryIncref(ptr, value)) {
         return value;
     }
     return NULL;
@@ -499,7 +499,6 @@ _Py_NewRefWithLock(PyObject *op)
             return op;
         }
     }
-    return op;
 }
 
 static inline PyObject *
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ _Py_TryIncRefShared(PyObject *op)`
`430`	`430`
`431`	`431`	`/* Tries to incref the object op and ensures that src still points to it. /`
`432`	`432`	`static inline int`
`433`		`-_Py_TryAcquireObject(PyObject *src, PyObject op)`
	`433`	`+_Py_TryIncref(PyObject *src, PyObject op)`
`434`	`434`	`{`
`435`	`435`	`if (_Py_TryIncrefFast(op)) {`
`436`	`436`	`return 1;`
`@@ -465,13 +465,13 @@ _Py_XGetRef(PyObject **ptr)`
`465`	`465`	`/* Attempts to loads and increfs an object from ptr. Returns NULL`
`466`	`466`	`on failure, which may be due to a NULL value or a concurrent update. */`
`467`	`467`	`static inline PyObject *`
`468`		`-_Py_TryXFetchRef(PyObject **ptr)`
	`468`	`+_Py_TryXGetRef(PyObject **ptr)`
`469`	`469`	`{`
`470`	`470`	`PyObject *value = _Py_atomic_load_ptr(ptr);`
`471`	`471`	`if (value == NULL) {`
`472`	`472`	`return value;`
`473`	`473`	`}`
`474`		`- if (_Py_TryAcquireObject(ptr, value)) {`
	`474`	`+ if (_Py_TryIncref(ptr, value)) {`
`475`	`475`	`return value;`
`476`	`476`	`}`
`477`	`477`	`return NULL;`
`@@ -499,7 +499,6 @@ _Py_NewRefWithLock(PyObject *op)`
`499`	`499`	`return op;`
`500`	`500`	`}`
`501`	`501`	`}`
`502`		`- return op;`
`503`	`502`	`}`
`504`	`503`
`505`	`504`	`static inline PyObject *`