fix review idea

Signed-off-by: Manjusaka <me@manjusaka.me>
python · brandtbucher · May 20, 2025 · May 3, 2025 · May 3, 2025 · May 3, 2025
commit d1e3a2be92950ae536ccfab45f7eef4984b4b325
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
@@ -1942,33 +1942,49 @@ def testfunc(n):
 
     def test_get_len_with_non_const_tuple(self):
         def testfunc(n):
-            x = ""
+            x = 0.0
             for _ in range(n):
                 match (object(), object()):
                     case [_, _]:
-                        x += "1"
+                        x += 1.0
             return x
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(len(res), TIER2_THRESHOLD)
+        self.assertEqual(int(res), TIER2_THRESHOLD)
         uops = get_opnames(ex)
         self.assertNotIn("_GUARD_NOS_INT", uops)
         self.assertIn("_GET_LEN", uops)
         self.assertIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
 
     def test_get_len_with_non_tuple(self):
         def testfunc(n):
-            x = ""
+            x = 0.0
             for _ in range(n):
                 match [1, 2, 3, 4]:
                     case [_, _, _, _]:
-                        x += "1"
+                        x += 1.0
             return x
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(len(res), TIER2_THRESHOLD)
+        self.assertEqual(int(res), TIER2_THRESHOLD)
         uops = get_opnames(ex)
         self.assertNotIn("_GUARD_NOS_INT", uops)
         self.assertIn("_GET_LEN", uops)
-        self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
+
+    def test_get_len_with_immortal_tuple(self):
+        def testfunc(n):
+            class TestObject(tuple):
+                pass
+            x = 0.0
+            for _ in range(n):
+                match TestObject.__mro__:
+                    case (_, _, _,):
+                        x += 1.0
+            return x
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(int(res), TIER2_THRESHOLD)
+        uops = get_opnames(ex)
+        self.assertIn("_GET_LEN", uops)
+        self.assertIn("_LOAD_CONST_INLINE_BORROW", uops)
+
 
     def test_binary_op_subscr_tuple_int(self):
         def testfunc(n):

@@ -3,6 +3,7 @@
 #include "pycore_uops.h"
 #include "pycore_uop_ids.h"
 #include "internal/pycore_moduleobject.h"
+#include "refcount.h"
 
 #define op(name, ...) /* NAME is ignored */
 
@@ -1128,6 +1129,9 @@ dummy_func(void) {
                 goto error;
             }
             len = sym_new_const(ctx, temp);
+            if (_Py_IsImmortal(temp)) {
+                REPLACE_OP(this_instr, _LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)temp);
+            }
             Py_DECREF(temp);
         }
     }

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