fix

Author: corona10

Python/optimizer_analysis.c

@@ -342,10 +342,10 @@ optimize_to_bool(
     if (truthiness >= 0) {
         PyObject *load = truthiness ? Py_True : Py_False;
         if (insert_mode) {
-            ADD_OP(_INSERT_1_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)load);
+            ADD_OP(_INSERT_1_LOAD_CONST_INLINE_BORROW, 0, PyStackRef_TagBorrow(load));
         } else {
             ADD_OP(_POP_TOP, 0, 0);
-            ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)load);
+            ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, PyStackRef_TagBorrow(load));
         }
         *result_ptr = sym_new_const(ctx, load);
         return 1;
@@ -402,11 +402,11 @@ lookup_attr(JitOptContext *ctx, _PyBloomFilter *dependencies, _PyUOpInstruction
             if (pop) {
                 ADD_OP(_POP_TOP, 0, 0);
                 ADD_OP(immortal ? _LOAD_CONST_INLINE_BORROW : _LOAD_CONST_INLINE,
-                       0, (uintptr_t)lookup);
+                       0, immortal ? PyStackRef_TagBorrow(lookup) : (uintptr_t)lookup);
             }
             else {
                 ADD_OP(immortal ? _INSERT_1_LOAD_CONST_INLINE_BORROW : _INSERT_1_LOAD_CONST_INLINE,
-                       0, (uintptr_t)lookup);
+                       0, immortal ? PyStackRef_TagBorrow(lookup) : (uintptr_t)lookup);
             }
             PyType_Watch(TYPE_WATCHER_ID, (PyObject *)type);
             _Py_BloomFilter_Add(dependencies, type);

Python/optimizer_cases.c.h

@@ -241,20 +241,20 @@ def replace_opcode_if_evaluates_pure(
                     # (a -- res), usually for unary ops
                     0: [("_POP_TOP", "0, 0"),
                         ("_LOAD_CONST_INLINE_BORROW",
-                         "0, (uintptr_t)result")],
+                         "0, PyStackRef_TagBorrow(result)")],
                     # (left -- res, left)
                     # usually for unary ops with passthrough references
                     1: [("_INSERT_1_LOAD_CONST_INLINE_BORROW",
-                         "0, (uintptr_t)result")],
+                         "0, PyStackRef_TagBorrow(result)")],
                 },
                 2: {
                     # (a, b -- res), usually for binary ops
                     0: [("_POP_TWO_LOAD_CONST_INLINE_BORROW",
-                         "0, (uintptr_t)result")],
+                         "0, PyStackRef_TagBorrow(result)")],
                     # (left, right -- res, left, right)
                     # usually for binary ops with passthrough references
                     2: [("_INSERT_2_LOAD_CONST_INLINE_BORROW",
-                         "0, (uintptr_t)result")],
+                         "0, PyStackRef_TagBorrow(result)")],
                 },
             }