bpo-44626: Merge basic blocks earlier to enable better handling of exit blocks without line numbers (GH-27138) (GH-27182)

(cherry picked from commit a86f7dae0acf918d54086cb85e5a0b0bedeedce7)

1 files changed, 18 insertions, 3 deletions

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index adbb5b56dc..213c88b404 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -986,14 +986,29 @@ class TraceTestCase(unittest.TestCase):
             except Exception:
                 pass
 
-        # This doesn't conform to PEP 626
         self.run_and_compare(func,
             [(0, 'call'),
              (1, 'line'),
              (2, 'line'),
              (3, 'line'),
-             (5, 'line'),
-             (5, 'return')])
+             (3, 'return')])
+
+    def test_if_in_if_in_if(self):
+        def func(a=0, p=1, z=1):
+            if p:
+                if a:
+                    if z:
+                        pass
+                    else:
+                        pass
+            else:
+                pass
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (2, 'return')])
 
     def test_early_exit_with(self):