From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Fri, 22 Sep 2023 16:59:35 +0000 (+0100)
Subject: gh-109719: Fix missing jump target labels when compiler reorders cold/warm blocks... 
X-Git-Tag: v3.13.0a1~340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c553991724d8d537f8444db73f016008753d77a;p=thirdparty%2FPython%2Fcpython.git

gh-109719: Fix missing jump target labels when compiler reorders cold/warm blocks (#109734)
---

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index f4e28559194d..d3a5517963c5 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1261,6 +1261,17 @@ class TestSpecifics(unittest.TestCase):
                 except:
                     pass
 
+    def test_cold_block_moved_to_end(self):
+        # See gh-109719
+        def f():
+            while name:
+                try:
+                    break
+                except:
+                    pass
+            else:
+                1 if 1 else 1
+
 
 @requires_debug_ranges()
 class TestSourcePositions(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-22-13-38-17.gh-issue-109719.fx5OTz.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-22-13-38-17.gh-issue-109719.fx5OTz.rst
new file mode 100644
index 000000000000..83be54c9ca79
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-09-22-13-38-17.gh-issue-109719.fx5OTz.rst	
@@ -0,0 +1 @@
+Fix missing jump target labels when compiler reorders cold/warm blocks.
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index 2df9b4811817..adfcef33895a 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -2133,6 +2133,8 @@ push_cold_blocks_to_end(cfg_builder *g) {
     }
     RETURN_IF_ERROR(mark_cold(entryblock));
 
+    int next_lbl = get_max_label(g->g_entryblock) + 1;
+
     /* If we have a cold block with fallthrough to a warm block, add */
     /* an explicit jump instead of fallthrough */
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
@@ -2141,6 +2143,9 @@ push_cold_blocks_to_end(cfg_builder *g) {
             if (explicit_jump == NULL) {
                 return ERROR;
             }
+            if (!IS_LABEL(b->b_next->b_label)) {
+                b->b_next->b_label.id = next_lbl++;
+            }
             basicblock_addop(explicit_jump, JUMP, b->b_next->b_label.id, NO_LOCATION);
             explicit_jump->b_cold = 1;
             explicit_jump->b_next = b->b_next;