address code review. remove commented code. better names.

Author: Klaus117

Lib/test/test_capi/test_opt.py

@@ -1441,19 +1441,19 @@ def test_narrow_type_to_constant_int_zero(self):
         def f(n):
             trace = []
             for i in range(n):
-                # f is always (int) 0, but we can only prove that it's a integer:
-                f = i - i # at this point python knows f is an int, but doesnt know that it is 0 (we know it is 0 though)
+                # zero is always (int) 0, but we can only prove that it's a integer:
+                zero = i - i # at this point python knows f is an int, but doesnt know that it is 0 (we know it is 0 though)
                 trace.append("A")
-                if not f:  # Kept.
+                if not zero:  # Kept.
                     trace.append("B")
-                    if not f:  # Removed!
+                    if not zero:  # Removed!
                         trace.append("C")
                     trace.append("D")
-                    if f:  # Removed!
+                    if zero:  # Removed!
                         trace.append("X")
                     trace.append("E")
                 trace.append("F")
-                if f:  # Removed!
+                if zero:  # Removed!
                     trace.append("X")
                 trace.append("G")
             return trace
@@ -1468,36 +1468,6 @@ def f(n):
         # But all of the appends we care about are still there:
         self.assertEqual(uops.count("_CALL_LIST_APPEND"), len("ABCDEFG"))
 
-    # def test_narrow_type_to_constant_bool_true(self):
-    #     def f(n):
-    #         trace = []
-    #         for i in range(n):
-    #             # f is always True, but we can only prove that it's a bool:
-    #             f = i != TIER2_THRESHOLD
-    #             trace.append("A")
-    #             if f:  # Kept.
-    #                 trace.append("B")
-    #                 if not f:  # Removed!
-    #                     trace.append("X")
-    #                 trace.append("C")
-    #                 if f:  # Removed!
-    #                     trace.append("D")
-    #                 trace.append("E")
-    #             trace.append("F")
-    #             if not f:  # Removed!
-    #                 trace.append("X")
-    #             trace.append("G")
-    #         return trace
-
-    #     trace, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
-    #     self.assertEqual(trace, list("ABCDEFG") * TIER2_THRESHOLD)
-    #     self.assertIsNotNone(ex)
-    #     uops = get_opnames(ex)
-    #     # Only one guard remains:
-    #     self.assertEqual(uops.count("_GUARD_IS_FALSE_POP"), 0)
-    #     self.assertEqual(uops.count("_GUARD_IS_TRUE_POP"), 1)
-    #     # But all of the appends we care about are still there:
-    #     self.assertEqual(uops.count("_CALL_LIST_APPEND"), len("ABCDEFG"))
 
 def global_identity(x):
     return x

Python/optimizer_bytecodes.c

@@ -417,12 +417,8 @@ dummy_func(void) {
             // removed and the narrowed value to be invalid:
             if (next_opcode == _GUARD_IS_FALSE_POP) {
                 sym_set_const(value, Py_GetConstant(Py_CONSTANT_ZERO));
-                res = sym_new_type(ctx, &PyLong_Type);
+                res = sym_new_type(ctx, &PyBool_Type);
             }
-            // else if (next_opcode == _GUARD_IS_TRUE_POP) {
-            //     sym_set_const(value, Py_True);
-            //     res = sym_new_type(ctx, &PyBool_Type);
-            // }
         }
     }