Make the default build work

Author: mpage

Include/internal/pycore_stackref.h

@@ -146,6 +146,12 @@ PyStackRef_CLOSE(_PyStackRef ref)
     Py_DECREF(obj);
 }
 
+static inline _PyStackRef
+_PyStackRef_NewIfBorrowedOrSteal(_PyStackRef ref)
+{
+    return ref;
+}
+
 static inline _PyStackRef
 _PyStackRef_DUP(_PyStackRef ref, const char *filename, int linenumber)
 {
@@ -274,9 +280,6 @@ PyStackRef_DUP(_PyStackRef stackref)
 {
     assert(!PyStackRef_IsNull(stackref));
     if (PyStackRef_IsDeferred(stackref)) {
-        /* assert(_Py_IsImmortal(PyStackRef_AsPyObjectBorrow(stackref)) || */
-        /*        _PyObject_HasDeferredRefcount(PyStackRef_AsPyObjectBorrow(stackref)) */
-        /* ); */
         return stackref;
     }
     Py_INCREF(PyStackRef_AsPyObjectBorrow(stackref));
@@ -322,6 +325,8 @@ static const _PyStackRef PyStackRef_NULL = { .bits = 0 };
 
 #define PyStackRef_DUP(stackref) PyStackRef_FromPyObjectSteal(Py_NewRef(PyStackRef_AsPyObjectBorrow(stackref)))
 
+#define _PyStackRef_NewIfBorrowedOrSteal(stackref) stackref
+
 #define PyStackRef_CLOSE_SPECIALIZED(stackref, dealloc) _Py_DECREF_SPECIALIZED(PyStackRef_AsPyObjectBorrow(stackref), dealloc)
 
 #endif // Py_GIL_DISABLED

Lib/test/test_dis.py

@@ -877,7 +877,7 @@ def load_test(x, y=0):
 %3d           LOAD_FAST_LOAD_FAST      1 (x, y)
               STORE_FAST_STORE_FAST   50 (b, a)
 
-%3d           LOAD_FAST_LOAD_FAST     35 (a, b)
+%3d           LOAD_FAST_BORROW_LOAD_FAST_BORROW 35 (a, b)
               BUILD_TUPLE              2
               RETURN_VALUE
 """ % (load_test.__code__.co_firstlineno,

Python/bytecodes.c

@@ -271,7 +271,12 @@ dummy_func(
         }
 
         inst (LOAD_FAST_BORROW, (-- value)) {
+            assert(!PyStackRef_IsNull(GETLOCAL(oparg)));
+            #ifdef Py_GIL_DISABLED
             value = PyStackRef_AsDeferred(GETLOCAL(oparg));
+            #else
+            value = PyStackRef_DUP(GETLOCAL(oparg));
+            #endif
         }
 
         inst(LOAD_FAST_AND_CLEAR, (-- value)) {
@@ -289,8 +294,13 @@ dummy_func(
         inst(LOAD_FAST_BORROW_LOAD_FAST_BORROW, ( -- value1, value2)) {
             uint32_t oparg1 = oparg >> 4;
             uint32_t oparg2 = oparg & 15;
+            #ifdef Py_GIL_DISABLED
             value1 = PyStackRef_AsDeferred(GETLOCAL(oparg1));
             value2 = PyStackRef_AsDeferred(GETLOCAL(oparg2));
+            #else
+            value1 = PyStackRef_DUP(GETLOCAL(oparg1));
+            value2 = PyStackRef_DUP(GETLOCAL(oparg2));
+            #endif
         }
 
         family(LOAD_CONST, 0) = {