Don't assume next block has instructions

DinoV · DinoV · commit 7e087d7e7735 · 2025-09-10T15:05:04.000-07:00
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
@@ -3617,7 +3617,10 @@ propagate_line_numbers(basicblock *entryblock) {
         }
         if (is_jump(last)) {
             basicblock *target = last->i_target;
-            if (target->b_predecessors == 1) {
+            while (target->b_iused == 0 && target->b_predecessors == 1) {
+                target = target->b_next;
+            }
+            if (target->b_predecessors == 1 && target->b_iused > 0) {
                 if (target->b_instr[0].i_loc.lineno == NO_LOCATION.lineno) {
                     target->b_instr[0].i_loc = prev_location;
                 }

Original file line number	Diff line number	Diff line change
`@@ -3617,7 +3617,10 @@ propagate_line_numbers(basicblock *entryblock) {`
`3617`	`3617`	`}`
`3618`	`3618`	`if (is_jump(last)) {`
`3619`	`3619`	`basicblock *target = last->i_target;`
`3620`		`- if (target->b_predecessors == 1) {`
	`3620`	`+ while (target->b_iused == 0 && target->b_predecessors == 1) {`
	`3621`	`+ target = target->b_next;`
	`3622`	`+ }`
	`3623`	`+ if (target->b_predecessors == 1 && target->b_iused > 0) {`
`3621`	`3624`	`if (target->b_instr[0].i_loc.lineno == NO_LOCATION.lineno) {`
`3622`	`3625`	`target->b_instr[0].i_loc = prev_location;`
`3623`	`3626`	`}`