Get rid of PyStackRef_IsBorrowed

Author: mpage

Include/internal/pycore_stackref.h

@@ -104,12 +104,6 @@ PyStackRef_IsNone(_PyStackRef ref)
     return _Py_stackref_get_object(ref) == Py_None;
 }
 
-static inline bool
-PyStackRef_IsBorrowed(_PyStackRef ref)
-{
-    return false;
-}
-
 static inline PyObject *
 _PyStackRef_AsPyObjectBorrow(_PyStackRef ref, const char *filename, int linenumber)
 {
@@ -269,16 +263,6 @@ _PyStackRef_FromPyObjectSteal(PyObject *obj)
 }
 #   define PyStackRef_FromPyObjectSteal(obj) _PyStackRef_FromPyObjectSteal(_PyObject_CAST(obj))
 
-static inline bool
-PyStackRef_IsBorrowed(_PyStackRef stackref)
-{
-    if (PyStackRef_IsNull(stackref) || !PyStackRef_IsDeferred(stackref)) {
-        return false;
-    }
-    PyObject *obj = PyStackRef_AsPyObjectBorrow(stackref);
-    return !(_Py_IsImmortal(obj) || _PyObject_HasDeferredRefcount(obj));
-}
-
 static inline bool
 PyStackRef_IsHeapSafe(_PyStackRef stackref)
 {
@@ -292,11 +276,11 @@ PyStackRef_IsHeapSafe(_PyStackRef stackref)
 static inline _PyStackRef
 PyStackRef_MakeHeapSafe(_PyStackRef stackref)
 {
-    if (PyStackRef_IsBorrowed(stackref)) {
-        PyObject *obj = PyStackRef_AsPyObjectBorrow(stackref);
-        return (_PyStackRef){ .bits = (uintptr_t)(Py_NewRef(obj)) | Py_TAG_PTR };
+    if (PyStackRef_IsHeapSafe(stackref)) {
+        return stackref;
     }
-    return stackref;
+    PyObject *obj = PyStackRef_AsPyObjectBorrow(stackref);
+    return (_PyStackRef){ .bits = (uintptr_t)(Py_NewRef(obj)) | Py_TAG_PTR };
 }
 
 static inline _PyStackRef

Python/bytecodes.c

@@ -780,7 +780,7 @@ dummy_func(
              * only the locals reference, so PyUnicode_Append knows
              * that the string is safe to mutate.
              */
-            assert(Py_REFCNT(left_o) >= 2 || PyStackRef_IsBorrowed(left));
+            assert(Py_REFCNT(left_o) >= 2 || !PyStackRef_IsHeapSafe(left));
             PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc);
             DEAD(left);
             PyObject *temp = PyStackRef_AsPyObjectSteal(*target_local);

Python/executor_cases.c.h

@@ -596,7 +596,6 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "PyStackRef_FromPyObjectImmortal",
     "PyStackRef_FromPyObjectNew",
     "PyStackRef_FromPyObjectSteal",
-    "PyStackRef_IsBorrowed",
     "PyStackRef_IsExactly",
     "PyStackRef_FromPyObjectStealMortal",
     "PyStackRef_IsNone",