allow allow deferred things to be borrrowed too

Fidget-Spinner · Fidget-Spinner · commit b08ef603fe3e · 2025-11-16T23:12:19.000Z
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
@@ -114,7 +114,7 @@ convert_global_to_const(_PyUOpInstruction *inst, PyObject *obj, bool pop)
     if (res == NULL) {
         return NULL;
     }
-    if (_Py_IsImmortal(res)) {
+    if (_Py_IsImmortal(res) || _PyObject_HasDeferredRefcount(res)) {
         inst->opcode = pop ? _POP_TOP_LOAD_CONST_INLINE_BORROW : _LOAD_CONST_INLINE_BORROW;
     }
     else {
@@ -233,7 +233,7 @@ lookup_attr(JitOptContext *ctx, _PyUOpInstruction *this_instr,
     if (type && PyType_Check(type)) {
         PyObject *lookup = _PyType_Lookup(type, name);
         if (lookup) {
-            int opcode = _Py_IsImmortal(lookup) ? immortal : mortal;
+            int opcode = _Py_IsImmortal(lookup) || _PyObject_HasDeferredRefcount(lookup) ? immortal : mortal;
             REPLACE_OP(this_instr, opcode, 0, (uintptr_t)lookup);
             return sym_new_const(ctx, lookup);
         }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ convert_global_to_const(_PyUOpInstruction inst, PyObject obj, bool pop)`
`114`	`114`	`if (res == NULL) {`
`115`	`115`	`return NULL;`
`116`	`116`	`}`
`117`		`- if (_Py_IsImmortal(res)) {`
	`117`	`+ if (_Py_IsImmortal(res) \|\| _PyObject_HasDeferredRefcount(res)) {`
`118`	`118`	`inst->opcode = pop ? _POP_TOP_LOAD_CONST_INLINE_BORROW : _LOAD_CONST_INLINE_BORROW;`
`119`	`119`	`}`
`120`	`120`	`else {`
`@@ -233,7 +233,7 @@ lookup_attr(JitOptContext ctx, _PyUOpInstruction this_instr,`
`233`	`233`	`if (type && PyType_Check(type)) {`
`234`	`234`	`PyObject *lookup = _PyType_Lookup(type, name);`
`235`	`235`	`if (lookup) {`
`236`		`- int opcode = _Py_IsImmortal(lookup) ? immortal : mortal;`
	`236`	`+ int opcode = _Py_IsImmortal(lookup) \|\| _PyObject_HasDeferredRefcount(lookup) ? immortal : mortal;`
`237`	`237`	`REPLACE_OP(this_instr, opcode, 0, (uintptr_t)lookup);`
`238`	`238`	`return sym_new_const(ctx, lookup);`
`239`	`239`	`}`