Set line number for RETURN_GENERATOR instruction.

Author: markshannon

Lib/test/test_compile.py

@@ -954,7 +954,7 @@ def return_genexp():
                     x
                     in
                     y)
-        genexp_lines = [None, 1, 3, 1]
+        genexp_lines = [1, 3, 1]
 
         genexp_code = return_genexp.__code__.co_consts[1]
         code_lines = [ None if line is None else line-return_genexp.__code__.co_firstlineno
@@ -967,7 +967,7 @@ async def test(aseq):
             async for i in aseq:
                 body
 
-        expected_lines = [None, 0, 1, 2, 1]
+        expected_lines = [0, 1, 2, 1]
         code_lines = [ None if line is None else line-test.__code__.co_firstlineno
                       for (_, _, line) in test.__code__.co_lines() ]
         self.assertEqual(expected_lines, code_lines)

Python/compile.c

@@ -8002,9 +8002,9 @@ insert_prefix_instructions(struct compiler *c, basicblock *entryblock,
         struct instr make_gen = {
             .i_opcode = RETURN_GENERATOR,
             .i_oparg = 0,
-            .i_lineno = -1,
+            .i_lineno = c->u->u_firstlineno,
             .i_col_offset = -1,
-            .i_end_lineno = -1,
+            .i_end_lineno = c->u->u_firstlineno,
             .i_end_col_offset = -1,
             .i_target = NULL,
         };