From: Dino Viehland <dinoviehland@meta.com>
Date: Fri, 29 Aug 2025 18:49:35 +0000 (-0700)
Subject: gh-138250: load fast optimization should fall through to empty blocks (#138249)
X-Git-Tag: v3.15.0a1~570
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e05182f98ea100b6e26796a76b1399237aeac22f;p=thirdparty%2FPython%2Fcpython.git

gh-138250: load fast optimization should fall through to empty blocks (#138249)

load fast optimization should fall through to empty blocks
---

diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index f8a4fa60f223..3a29845db9f7 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -2993,11 +2993,8 @@ optimize_load_fast(cfg_builder *g)
         }
 
         // Push fallthrough block
-        cfg_instr *term = basicblock_last_instr(block);
-        if (term != NULL && block->b_next != NULL &&
-            !(IS_UNCONDITIONAL_JUMP_OPCODE(term->i_opcode) ||
-              IS_SCOPE_EXIT_OPCODE(term->i_opcode))) {
-            assert(BB_HAS_FALLTHROUGH(block));
+        if (BB_HAS_FALLTHROUGH(block)) {
+            assert(block->b_next != NULL);
             load_fast_push_block(&sp, block->b_next, refs.size);
         }