Revert "pythongh-148438: implement _RECORD_BOUND_METHOD in JIT (pythonGH-148457)"

This reverts commit 6349262.

Author: prakashsellathurai

Lib/test/test_capi/test_opt.py

@@ -1723,49 +1723,6 @@ def testfunc(n):
         self.assertIn("_CHECK_FUNCTION_VERSION_INLINE", uops)
         self.assertNotIn("_CHECK_METHOD_VERSION", uops)
 
-    def test_record_bound_method_general(self):
-        class MyClass:
-            def method(self, *args):
-                return args[0] + 1
-
-        def testfunc(n):
-            obj = MyClass()
-            bound = obj.method
-            result = 0
-            for i in range(n):
-                result += bound(i)
-            return result
-
-        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(
-            res, sum(i + 1 for i in range(TIER2_THRESHOLD))
-        )
-        self.assertIsNotNone(ex)
-        uops = get_opnames(ex)
-        self.assertIn("_PUSH_FRAME", uops)
-
-    def test_record_bound_method_exact_args(self):
-        class MyClass:
-            def method(self, x):
-                return x + 1
-
-        def testfunc(n):
-            obj = MyClass()
-            bound = obj.method
-            result = 0
-            for i in range(n):
-                result += bound(i)
-            return result
-
-        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(
-            res, sum(i + 1 for i in range(TIER2_THRESHOLD))
-        )
-        self.assertIsNotNone(ex)
-        uops = get_opnames(ex)
-        self.assertIn("_PUSH_FRAME", uops)
-        self.assertNotIn("_CHECK_FUNCTION_EXACT_ARGS", uops)
-
     def test_jit_error_pops(self):
         """
         Tests that the correct number of pops are inserted into the

Python/bytecodes.c

@@ -6160,7 +6160,8 @@ dummy_func(
         tier2 op(_RECORD_BOUND_METHOD, (callable, self, args[oparg] -- callable, self, args[oparg])) {
             PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
             if (Py_TYPE(callable_o) == &PyMethod_Type) {
-                RECORD_VALUE(callable_o);
+                PyObject *func = ((PyMethodObject *)callable_o)->im_func;
+                RECORD_VALUE(func);
             }
         }
 

Python/optimizer_bytecodes.c

@@ -996,18 +996,8 @@ dummy_func(void) {
     }
 
     op(_INIT_CALL_BOUND_METHOD_EXACT_ARGS, (callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
-        PyObject *bound_method = sym_get_probable_value(callable);
-        if (bound_method != NULL && Py_TYPE(bound_method) == &PyMethod_Type) {
-            PyMethodObject *method = (PyMethodObject *)bound_method;
-            callable = sym_new_not_null(ctx);
-            sym_set_recorded_value(callable, method->im_func);
-            self_or_null = sym_new_not_null(ctx);
-            sym_set_recorded_value(self_or_null, method->im_self);
-        }
-        else {
-            callable = sym_new_not_null(ctx);
-            self_or_null = sym_new_not_null(ctx);
-        }
+        callable = sym_new_not_null(ctx);
+        self_or_null = sym_new_not_null(ctx);
     }
 
     op(_CHECK_FUNCTION_VERSION, (func_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
@@ -1029,19 +1019,6 @@ dummy_func(void) {
             ADD_OP(_CHECK_FUNCTION_VERSION_INLINE, 0, func_version);
             uop_buffer_last(&ctx->out_buffer)->operand1 = (uintptr_t)method->im_func;
         }
-        else {
-            // Guarding on the bound method, safe to promote.
-            PyObject *bound_method = sym_get_probable_value(callable);
-            if (bound_method != NULL && Py_TYPE(bound_method) == &PyMethod_Type) {
-                PyMethodObject *method = (PyMethodObject *)bound_method;
-                PyObject *func = method->im_func;
-                if (PyFunction_Check(func) &&
-                    ((PyFunctionObject *)func)->func_version == func_version) {
-                    _Py_BloomFilter_Add(dependencies, func);
-                    sym_set_const(callable, bound_method);
-                }
-            }
-        }
         sym_set_type(callable, &PyMethod_Type);
     }
 
@@ -1080,18 +1057,6 @@ dummy_func(void) {
         }
     }
 
-    op(_EXPAND_METHOD, (callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
-        if (sym_is_const(ctx, callable) && sym_matches_type(callable, &PyMethod_Type)) {
-            PyMethodObject *method = (PyMethodObject *)sym_get_const(ctx, callable);
-            callable = sym_new_const(ctx, method->im_func);
-            self_or_null = sym_new_const(ctx, method->im_self);
-        }
-        else {
-            callable = sym_new_not_null(ctx);
-            self_or_null = sym_new_not_null(ctx);
-        }
-    }
-
     op(_MAYBE_EXPAND_METHOD, (callable, self_or_null, args[oparg] -- callable, self_or_null, args[oparg])) {
         (void)args;
         callable = sym_new_not_null(ctx);
@@ -2261,10 +2226,6 @@ dummy_func(void) {
         sym_set_recorded_value(func, (PyObject *)this_instr->operand0);
     }
 
-    op(_RECORD_BOUND_METHOD, (callable, self, args[oparg] -- callable, self, args[oparg])) {
-        sym_set_recorded_value(callable, (PyObject *)this_instr->operand0);
-    }
-
     op(_RECORD_NOS_GEN_FUNC, (nos, tos -- nos, tos)) {
         PyFunctionObject *func = (PyFunctionObject *)this_instr->operand0;
         assert(func == NULL || PyFunction_Check(func));