Merge remote-tracking branch 'upstream/main' into gh-134584-unicode

python · corona10 · Jun 22, 2025 · Jun 22, 2025 · Jun 22, 2025 · Jun 22, 2025
commit d95aee942ad0cbf2360cbd283cf39654aa2588c0
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
@@ -344,7 +344,6 @@ dummy_func(
             PyStackRef_XCLOSE(value);
         }
 
-
         op(_POP_TOP_NOP, (value --)) {
             assert(PyStackRef_IsNull(value) || (!PyStackRef_RefcountOnObject(value)) ||
                 _Py_IsImmortal((PyStackRef_AsPyObjectBorrow(value))));

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
@@ -570,16 +570,11 @@ dummy_func(void) {
         }
     }
 
-    op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
-        assert(oparg > 0);
-        top = bottom;
-    }
-
     op(_POP_TOP, (value -- )) {
         PyTypeObject *typ = sym_get_type(value);
-        PyObject *const_val = sym_get_const(ctx, value);
         if (PyJitRef_IsBorrowed(value) ||
-            (const_val != NULL && _Py_IsImmortal(const_val))) {
+            sym_is_immortal(PyJitRef_Unwrap(value)) ||
+            sym_is_null(value)) {
             REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0);
         }
         else if (typ == &PyLong_Type) {
@@ -591,9 +586,11 @@ dummy_func(void) {
         else if (typ == &PyUnicode_Type) {
             REPLACE_OP(this_instr, _POP_TOP_UNICODE, 0, 0);
         }
-        else if (typ == &PyBool_Type) {
-            REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0);
-        }
+    }
+
+    op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
+        assert(oparg > 0);
+        top = bottom;
     }
 
     op(_SWAP, (bottom, unused[oparg-2], top -- bottom, unused[oparg-2], top)) {
@@ -833,6 +830,8 @@ dummy_func(void) {
     }
 
     op(_RETURN_VALUE, (retval -- res)) {
+        // We wrap and unwrap the value to mimic PyStackRef_MakeHeapSafe
+        // in bytecodes.c
         JitOptRef temp = PyJitRef_Wrap(PyJitRef_Unwrap(retval));
         DEAD(retval);
         SAVE_STACK();

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h