Update commented out assertion

Author: mpage

Include/internal/pycore_stackref.h

@@ -101,6 +101,12 @@ 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)
 {
@@ -220,7 +226,7 @@ _PyStackRef_FromPyObjectSteal(PyObject *obj)
 #   define PyStackRef_FromPyObjectSteal(obj) _PyStackRef_FromPyObjectSteal(_PyObject_CAST(obj))
 
 static inline bool
-_PyStackRef_IsBorrowed(_PyStackRef stackref)
+PyStackRef_IsBorrowed(_PyStackRef stackref)
 {
     if (PyStackRef_IsNull(stackref) || !PyStackRef_IsDeferred(stackref)) {
         return false;
@@ -233,7 +239,7 @@ _PyStackRef_IsBorrowed(_PyStackRef stackref)
 static inline _PyStackRef
 _PyStackRef_NewIfBorrowedOrSteal(_PyStackRef stackref)
 {
-    if (_PyStackRef_IsBorrowed(stackref)) {
+    if (PyStackRef_IsBorrowed(stackref)) {
         PyObject *obj = PyStackRef_AsPyObjectBorrow(stackref);
         return (_PyStackRef){ .bits = (uintptr_t)(Py_NewRef(obj)) | Py_TAG_PTR };
     }
@@ -310,6 +316,7 @@ static const _PyStackRef PyStackRef_NULL = { .bits = 0 };
 #define PyStackRef_True ((_PyStackRef){.bits = (uintptr_t)&_Py_TrueStruct })
 #define PyStackRef_False ((_PyStackRef){.bits = ((uintptr_t)&_Py_FalseStruct) })
 #define PyStackRef_None ((_PyStackRef){.bits = ((uintptr_t)&_Py_NoneStruct) })
+#define PyStackRef_IsBorrowed(stackref) false
 
 #define PyStackRef_AsPyObjectBorrow(stackref) ((PyObject *)(stackref).bits)
 

Programs/test_frozenmain.h

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

Python/bytecodes.c

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