Remove the unrelated changes

Author: aisk

Lib/test/test_capi/test_opt.py

@@ -2893,37 +2893,10 @@ def testfunc(n):
         self.assertEqual(res, 3.5)
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
-        for uop in uops:
-            print(uop)
         self.assertIn("_BINARY_OP_EXTEND", uops)
         self.assertIn("_POP_TOP_NOP", uops)
         self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
 
-    def test_binary_op_refcount_elimination(self):
-        class CustomAdder:
-            def __init__(self, val):
-                self.val = val
-            def __add__(self, other):
-                return CustomAdder(self.val + other.val)
-
-        def testfunc(n):
-            a = CustomAdder(1)
-            b = CustomAdder(2)
-            res = None
-            for _ in range(n):
-                res = a + b
-            return res.val if res else 0
-
-        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(res, 3)
-        self.assertIsNotNone(ex)
-        uops = get_opnames(ex)
-        for uop in uops:
-            print(uop)
-        self.assertIn("_BINARY_OP", uops)
-        self.assertIn("_POP_TOP_NOP", uops)
-        self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
-
     def test_remove_guard_for_slice_list(self):
         def f(n):
             for i in range(n):

Python/bytecodes.c

@@ -5119,7 +5119,7 @@ dummy_func(
             assert(oparg <= NB_OPARG_LAST);
         }
 
-        op(_BINARY_OP, (lhs, rhs -- res, l, r)) {
+        op(_BINARY_OP, (lhs, rhs -- res)) {
             PyObject *lhs_o = PyStackRef_AsPyObjectBorrow(lhs);
             PyObject *rhs_o = PyStackRef_AsPyObjectBorrow(rhs);
 
@@ -5129,13 +5129,10 @@ dummy_func(
                 ERROR_NO_POP();
             }
             res = PyStackRef_FromPyObjectSteal(res_o);
-            l = lhs;
-            r = rhs;
-            DEAD(lhs);
-            DEAD(rhs);
+            DECREF_INPUTS();
         }
 
-        macro(BINARY_OP) = _SPECIALIZE_BINARY_OP + unused/4 + _BINARY_OP + POP_TOP + POP_TOP;
+        macro(BINARY_OP) = _SPECIALIZE_BINARY_OP + unused/4 + _BINARY_OP;
 
         pure replicate(2:4) inst(SWAP, (bottom, unused[oparg-2], top --
                     bottom, unused[oparg-2], top)) {

Python/optimizer_bytecodes.c

@@ -210,10 +210,8 @@ dummy_func(void) {
         sym_set_type(left, &PyFloat_Type);
     }
 
-    op(_BINARY_OP, (lhs, rhs -- res, l, r)) {
+    op(_BINARY_OP, (lhs, rhs -- res)) {
         REPLACE_OPCODE_IF_EVALUATES_PURE(lhs, rhs, res);
-        l = lhs;
-        r = rhs;
         bool lhs_int = sym_matches_type(lhs, &PyLong_Type);
         bool rhs_int = sym_matches_type(rhs, &PyLong_Type);
         bool lhs_float = sym_matches_type(lhs, &PyFloat_Type);