update peepholer test

Author: WolframAlph

Lib/test/test_peepholer.py

@@ -1650,33 +1650,37 @@ def test_optimize_unary_not(self):
         # test folding
         before = [
             ('LOAD_SMALL_INT', 1, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('RETURN_VALUE', None, 0),
         ]
         after = [
-            ('LOAD_CONST', 0, 0),
+            ('LOAD_CONST', 1, 0),
             ('RETURN_VALUE', None, 0),
         ]
-        self.cfg_optimization_test(before, after, consts=[], expected_consts=[False])
+        self.cfg_optimization_test(before, after, consts=[], expected_consts=[True, False])
 
         # test cancel out
         before = [
-            ('LOAD_SMALL_INT', 1, 0),
+            ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('UNARY_NOT', None, 0),
             ('UNARY_NOT', None, 0),
             ('UNARY_NOT', None, 0),
             ('RETURN_VALUE', None, 0),
         ]
         after = [
-            ('LOAD_SMALL_INT', 1, 0),
+            ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('RETURN_VALUE', None, 0),
         ]
         self.cfg_optimization_test(before, after, consts=[], expected_consts=[])
 
         # test eliminate to bool
         before = [
             ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('TO_BOOL', None, 0),
             ('TO_BOOL', None, 0),
@@ -1685,29 +1689,48 @@ def test_optimize_unary_not(self):
         ]
         after = [
             ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('RETURN_VALUE', None, 0),
         ]
         self.cfg_optimization_test(before, after, consts=[], expected_consts=[])
 
+        # test folding & cancel out
+        before = [
+            ('LOAD_SMALL_INT', 1, 0),
+            ('TO_BOOL', None, 0),
+            ('UNARY_NOT', None, 0),
+            ('UNARY_NOT', None, 0),
+            ('UNARY_NOT', None, 0),
+            ('UNARY_NOT', None, 0),
+            ('RETURN_VALUE', None, 0),
+        ]
+        after = [
+            ('LOAD_CONST', 0, 0),
+            ('RETURN_VALUE', None, 0),
+        ]
+        self.cfg_optimization_test(before, after, consts=[], expected_consts=[True])
+
         # test folding & eliminate to bool
         before = [
             ('LOAD_SMALL_INT', 1, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('TO_BOOL', None, 0),
             ('TO_BOOL', None, 0),
             ('TO_BOOL', None, 0),
             ('RETURN_VALUE', None, 0),
         ]
         after = [
-            ('LOAD_CONST', 0, 0),
+            ('LOAD_CONST', 1, 0),
             ('RETURN_VALUE', None, 0),
         ]
-        self.cfg_optimization_test(before, after, consts=[], expected_consts=[False])
+        self.cfg_optimization_test(before, after, consts=[], expected_consts=[True, False])
 
-        # test cancel out & eliminate to bool (to bool stays)
+        # test cancel out & eliminate to bool (to bool stays as we are not iterating to a fixed point)
         before = [
-            ('LOAD_SMALL_INT', 1, 0),
+            ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('UNARY_NOT', None, 0),
             ('UNARY_NOT', None, 0),
             ('UNARY_NOT', None, 0),
@@ -1716,7 +1739,8 @@ def test_optimize_unary_not(self):
             ('RETURN_VALUE', None, 0),
         ]
         after = [
-            ('LOAD_SMALL_INT', 1, 0),
+            ('LOAD_NAME', 0, 0),
+            ('TO_BOOL', None, 0),
             ('TO_BOOL', None, 0),
             ('RETURN_VALUE', None, 0),
         ]