gh-107901: Fix missing line number on BACKWARD_JUMP at the end of a for loop (#108242)

iritkatriel · web-flow · commit a1cc74c4eebc · 2023-08-21T23:44:31.000+01:00
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
@@ -1031,6 +1031,20 @@ async def test(aseq):
         code_lines = self.get_code_lines(test.__code__)
         self.assertEqual(expected_lines, code_lines)
 
+    def test_lineno_of_backward_jump(self):
+        # Issue gh-107901
+        def f():
+            for i in x:
+                if y:
+                    pass
+
+        linenos = list(inst.positions.lineno
+                       for inst in dis.get_instructions(f.__code__)
+                       if inst.opname == 'JUMP_BACKWARD')
+
+        self.assertTrue(len(linenos) > 0)
+        self.assertTrue(all(l is not None for l in linenos))
+
     def test_big_dict_literal(self):
         # The compiler has a flushing point in "compiler_dict" that calls compiles
         # a portion of the dictionary literal when the loop that iterates over the items
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-08-21-21-13-30.gh-issue-107901.hszvdk.rst b/Misc/NEWS.d/next/Core and Builtins/2023-08-21-21-13-30.gh-issue-107901.hszvdk.rst
@@ -0,0 +1 @@
+Fix missing line number on :opcode:`JUMP_BACKWARD` at the end of a for loop.
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
@@ -531,7 +531,7 @@ normalize_jumps_in_block(cfg_builder *g, basicblock *b) {
     if (backwards_jump == NULL) {
         return ERROR;
     }
-    basicblock_addop(backwards_jump, JUMP, target->b_label.id, NO_LOCATION);
+    basicblock_addop(backwards_jump, JUMP, target->b_label.id, last->i_loc);
     backwards_jump->b_instr[0].i_target = target;
     last->i_opcode = reversed_opcode;
     last->i_target = b->b_next;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix missing line number on :opcode:`JUMP_BACKWARD` at the end of a for loop.
Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ normalize_jumps_in_block(cfg_builder g, basicblock b) {`
`531`	`531`	`if (backwards_jump == NULL) {`
`532`	`532`	`return ERROR;`
`533`	`533`	`}`
`534`		`- basicblock_addop(backwards_jump, JUMP, target->b_label.id, NO_LOCATION);`
	`534`	`+ basicblock_addop(backwards_jump, JUMP, target->b_label.id, last->i_loc);`
`535`	`535`	`backwards_jump->b_instr[0].i_target = target;`
`536`	`536`	`last->i_opcode = reversed_opcode;`
`537`	`537`	`last->i_target = b->b_next;`