From f333ab0f2edec26a769ed558263ac662e5475451 Mon Sep 17 00:00:00 2001 From: Mark Shannon Date: Thu, 15 Jul 2021 14:37:57 +0100 Subject: bpo-44622: Set line number of END_ASYNC_FOR to match that of iterator. (GH-27160) --- Lib/test/test_compile.py | 12 +++++++++++- Python/compile.c | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index c994741..29bfd71 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -943,10 +943,20 @@ if 1: genexp_lines = [None, 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 + code_lines = [ None if line is None else line-return_genexp.__code__.co_firstlineno for (_, _, line) in genexp_code.co_lines() ] self.assertEqual(genexp_lines, code_lines) + def test_line_number_implicit_return_after_async_for(self): + + async def test(aseq): + async for i in aseq: + body + + expected_lines = [None, 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) def test_big_dict_literal(self): # The compiler has a flushing point in "compiler_dict" that calls compiles diff --git a/Python/compile.c b/Python/compile.c index 50ff9b0..e21c7a5 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3002,7 +3002,9 @@ compiler_async_for(struct compiler *c, stmt_ty s) /* Except block for __anext__ */ compiler_use_next_block(c, except); - UNSET_LOC(c); + /* Use same line number as the iterator, + * as the END_ASYNC_FOR succeeds the `for`, not the body. */ + SET_LOC(c, s->v.AsyncFor.iter); ADDOP(c, END_ASYNC_FOR); /* `else` block */ -- cgit v0.12