Apply suggestions from code review

Co-authored-by: Brandt Bucher <[email protected]>

Author: savannahostrowski

Lib/test/test_capi/test_opt.py

@@ -1575,7 +1575,7 @@ def testfunc(n):
             return x
 
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(res, 1)
+        self.assertEqual(res, TIER2_THRESHOLD)
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertNotIn("_COMPARE_OP_INT", uops)

Python/bytecodes.c

@@ -5132,7 +5132,7 @@ dummy_func(
             value = PyStackRef_FromPyObjectImmortal(ptr);
         }
 
-        tier2 pure op (_POP_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, pop1, pop2 -- value)) {
+        tier2 pure op(_POP_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, pop1, pop2 -- value)) {
             PyStackRef_CLOSE(pop2);
             PyStackRef_CLOSE(pop1);
             value = PyStackRef_FromPyObjectImmortal(ptr);

Python/optimizer_bytecodes.c

@@ -457,15 +457,11 @@ dummy_func(void) {
             if (tmp == NULL) {
                 goto error;
             }
+            assert(PyBool_Check(tmp));
+            assert(_Py_IsImmortal(tmp));
+            REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)tmp);
             res = sym_new_const(ctx, tmp);
             Py_DECREF(tmp);
-
-            if (_Py_IsImmortal(res)) {
-                REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)tmp);
-            }
-            else {
-                res = sym_new_type(ctx, &PyBool_Type);
-            }
         }
         else {
             res = sym_new_type(ctx, &PyBool_Type);