python · pablogsal · Jun 14, 2019 · Jun 14, 2019 · Jul 29, 2019 · Jul 29, 2019
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
@@ -293,24 +293,32 @@ def f(cond, true_value, false_value):

    def test_elim_jump_to_uncond_jump(self):
        # POP_JUMP_IF_FALSE to JUMP_FORWARD --> POP_JUMP_IF_FALSE to non-jump
+        # JUMP_FORWARD to JUMP_FORWARD --> JUMP_FORWARD to non-jump
        def f():
            if a:
-                # Intentionally use two-line expression to test issue37213.
-                if (c
-                    or d):
-                    foo()
+                if b:
+                    # Intentionally use two-line expression to test issue37213.
+                    if (c
+                        or d):
+                        foo()
+                else:
+                    bar()
            else:
                baz()
        self.check_jump_targets(f)

    def test_elim_jump_to_uncond_jump2(self):
        # POP_JUMP_IF_FALSE to JUMP_ABSOLUTE --> POP_JUMP_IF_FALSE to non-jump
+        # JUMP_FORWARD to JUMP_ABSOLUTE --> JUMP_FORWARD to non-jump
        def f():
            while a:
-                # Intentionally use two-line expression to test issue37213.
-                if (c
-                    or d):
-                    a = foo()
+                if b:
+                    # Intentionally use two-line expression to test issue37213.
+                    if (c
+                        or d):
+                        a = foo()
+                else:
+                    a = bar()
        self.check_jump_targets(f)

    def test_elim_jump_to_uncond_jump3(self):
@@ -370,7 +378,7 @@ def f(cond1, cond2):
        # There should be one jump for the while loop.
        returns = [instr for instr in dis.get_instructions(f)
                          if instr.opname == 'JUMP_ABSOLUTE']
-        self.assertEqual(len(returns), 1)
+        self.assertEqual(len(returns), 0)
        returns = [instr for instr in dis.get_instructions(f)
                          if instr.opname == 'RETURN_VALUE']
        self.assertLessEqual(len(returns), 2)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-14-02-59-58.bpo-37271.TRRfqt.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-14-02-59-58.bpo-37271.TRRfqt.rst
@@ -0,0 +1,2 @@
+The peephole optimizer now does multiple runs until the resulting bytecode
+cannot be optimized further. Patch by Pablo Galindo.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The peephole optimizer now does multiple runs until the resulting bytecode
		cannot be optimized further. Patch by Pablo Galindo.