fix review idea

Zheaoli · Zheaoli · commit 41838e9e293f · 2025-06-07T08:31:15.000+08:00
Signed-off-by: Manjusaka &lt;me@manjusaka.me&gt;
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
@@ -1371,15 +1371,20 @@ def testfunc(n):
         self.assertNotIn("_CHECK_FUNCTION_EXACT_ARGS", uops)
 
     def test_method_guards_removed_or_reduced(self):
+        class TestObject:
+            def test(self, *args, **kwargs):
+                return args[0]
+
+        test_object = TestObject()
+        test_bound_method = TestObject.test.__get__(test_object)
 
         def testfunc(n):
+            result = 0
             for i in range(n):
-                test_bound_method(i)
-
-
-        testfunc(TIER2_THRESHOLD)
-
-        ex = get_first_executor(testfunc)
+                result += test_bound_method(i)
+            return result
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(res, sum(range(TIER2_THRESHOLD)))
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertIn("_PUSH_FRAME", uops)
@@ -2236,14 +2241,6 @@ def f(n):
         self.assertNotIn("_LOAD_ATTR_METHOD_NO_DICT", uops)
         self.assertNotIn("_LOAD_ATTR_METHOD_LAZY_DICT", uops)
 
-class TestObject:
-    def test(self, *args, **kwargs):
-        return args[0]
-
-test_object = TestObject()
-test_bound_method = TestObject.test.__get__(test_object)
-
-
 def global_identity(x):
     return x
 
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
@@ -710,8 +710,8 @@ dummy_func(void) {
 
     op(_CHECK_METHOD_VERSION, (func_version/2, callable, null, unused[oparg] -- callable, null, unused[oparg])) {
         if (sym_is_const(ctx, callable) && sym_matches_type(callable, &PyMethod_Type)) {
-            assert(PyMethod_Check(sym_get_const(ctx, callable)));
             PyMethodObject *method = (PyMethodObject *)sym_get_const(ctx, callable);
+            assert(PyMethod_Check(method));
             REPLACE_OP(this_instr, _CHECK_FUNCTION_VERSION_INLINE, 0, func_version);
             this_instr->operand1 = (uintptr_t)method->im_func;
         }
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h

Original file line number	Diff line number	Diff line change
`@@ -710,8 +710,8 @@ dummy_func(void) {`
`710`	`710`
`711`	`711`	`op(_CHECK_METHOD_VERSION, (func_version/2, callable, null, unused[oparg] -- callable, null, unused[oparg])) {`
`712`	`712`	`if (sym_is_const(ctx, callable) && sym_matches_type(callable, &PyMethod_Type)) {`
`713`		`- assert(PyMethod_Check(sym_get_const(ctx, callable)));`
`714`	`713`	`PyMethodObject method = (PyMethodObject )sym_get_const(ctx, callable);`
	`714`	`+ assert(PyMethod_Check(method));`
`715`	`715`	`REPLACE_OP(this_instr, _CHECK_FUNCTION_VERSION_INLINE, 0, func_version);`
`716`	`716`	`this_instr->operand1 = (uintptr_t)method->im_func;`
`717`	`717`	`}`