From 93a9535d54d6f645ad2bfadf30f723c781e0fdd0 Mon Sep 17 00:00:00 2001 From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:08:54 -0600 Subject: [PATCH] [3.11] gh-101517: fix line number propagation in code generated for except* (#103550) (#103816) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual backport of https://github.com/python/cpython/pull/103550. * Issue: gh-101517 --------- Co-authored-by: Łukasz Langa --- Lib/bdb.py | 2 + Lib/test/test_bdb.py | 3 +- Lib/test/test_pdb.py | 19 ++++++++++ ...-04-14-22-35-23.gh-issue-101517.5EqM-S.rst | 1 + Python/compile.c | 38 ++++++++++++------- 5 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-04-14-22-35-23.gh-issue-101517.5EqM-S.rst diff --git a/Lib/bdb.py b/Lib/bdb.py index 7f9b09514ffd00..0f3eec653baaad 100644 --- a/Lib/bdb.py +++ b/Lib/bdb.py @@ -574,6 +574,8 @@ def format_stack_entry(self, frame_lineno, lprefix=': '): line = linecache.getline(filename, lineno, frame.f_globals) if line: s += lprefix + line.strip() + else: + s += f'{lprefix}Warning: lineno is None' return s # The following methods can be called by clients to use diff --git a/Lib/test/test_bdb.py b/Lib/test/test_bdb.py index 042c2daea7f797..c2df18cdbe1e71 100644 --- a/Lib/test/test_bdb.py +++ b/Lib/test/test_bdb.py @@ -1206,7 +1206,8 @@ def main(): class TestRegressions(unittest.TestCase): def test_format_stack_entry_no_lineno(self): # See gh-101517 - Bdb().format_stack_entry((sys._getframe(), None)) + self.assertIn('Warning: lineno is None', + Bdb().format_stack_entry((sys._getframe(), None))) if __name__ == "__main__": diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index e96dc7fa1cf6e7..1a0fbf405bffe9 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -1653,6 +1653,25 @@ def test_pdb_issue_gh_101673(): (Pdb) continue """ +def test_pdb_issue_gh_101517(): + """See GH-101517 + + Make sure pdb doesn't crash when the exception is caught in a try/except* block + + >>> def test_function(): + ... try: + ... raise KeyError + ... except* Exception as e: + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'continue' + ... ]): + ... test_function() + > (4)test_function() + -> except* Exception as e: + (Pdb) continue + """ @support.requires_subprocess() class PdbTestCase(unittest.TestCase): diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-04-14-22-35-23.gh-issue-101517.5EqM-S.rst b/Misc/NEWS.d/next/Core and Builtins/2023-04-14-22-35-23.gh-issue-101517.5EqM-S.rst new file mode 100644 index 00000000000000..730c6cd40d7235 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2023-04-14-22-35-23.gh-issue-101517.5EqM-S.rst @@ -0,0 +1 @@ +Fix bug in line numbers of instructions emitted for :keyword:`except* `. diff --git a/Python/compile.c b/Python/compile.c index 17d1df2c51e8f7..2170e82d4db69e 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3613,12 +3613,10 @@ compiler_try_except(struct compiler *c, stmt_ty s) [orig, res, exc] [orig, res, exc, E1] CHECK_EG_MATCH - [orig, red, rest/exc, match?] COPY 1 - [orig, red, rest/exc, match?, match?] POP_JUMP_IF_NOT_NONE H1 - [orig, red, exc, None] POP_TOP - [orig, red, exc] JUMP L2 + [orig, res, rest/exc, match?] COPY 1 + [orig, res, rest/exc, match?, match?] POP_JUMP_IF_NONE C1 - [orig, res, rest, match] H1: (or POP if no V1) + [orig, res, rest, match] (or POP if no V1) [orig, res, rest] SETUP_FINALLY R1 [orig, res, rest] @@ -3626,8 +3624,14 @@ compiler_try_except(struct compiler *c, stmt_ty s) [orig, res, rest, i, v] R1: LIST_APPEND 3 ) exc raised in except* body - add to res [orig, res, rest, i] POP + [orig, res, rest] JUMP LE2 - [orig, res, rest] L2: + [orig, res, rest] L2: NOP ) for lineno + [orig, res, rest] JUMP LE2 + + [orig, res, rest/exc, None] C1: POP + + [orig, res, rest] LE2: .............................etc....................... [orig, res, rest] Ln+1: LIST_APPEND 1 ) add unhandled exc to res (could be None) @@ -3700,8 +3704,12 @@ compiler_try_star_except(struct compiler *c, stmt_ty s) if (except == NULL) { return 0; } - basicblock *handle_match = compiler_new_block(c); - if (handle_match == NULL) { + basicblock *except_with_error = compiler_new_block(c); + if (except_with_error == NULL) { + return 0; + } + basicblock *no_match = compiler_new_block(c); + if (no_match == NULL) { return 0; } if (i == 0) { @@ -3725,13 +3733,9 @@ compiler_try_star_except(struct compiler *c, stmt_ty s) VISIT(c, expr, handler->v.ExceptHandler.type); ADDOP(c, CHECK_EG_MATCH); ADDOP_I(c, COPY, 1); - ADDOP_JUMP(c, POP_JUMP_IF_NOT_NONE, handle_match); - ADDOP(c, POP_TOP); // match - ADDOP_JUMP(c, JUMP, except); + ADDOP_JUMP(c, POP_JUMP_IF_NONE, no_match); } - compiler_use_next_block(c, handle_match); - basicblock *cleanup_end = compiler_new_block(c); if (cleanup_end == NULL) { return 0; @@ -3793,8 +3797,14 @@ compiler_try_star_except(struct compiler *c, stmt_ty s) ADDOP_I(c, LIST_APPEND, 3); // exc ADDOP(c, POP_TOP); // lasti - ADDOP_JUMP(c, JUMP, except); + ADDOP_JUMP(c, JUMP, except_with_error); compiler_use_next_block(c, except); + ADDOP(c, NOP); // to hold a propagated location info + ADDOP_JUMP(c, JUMP, except_with_error); + compiler_use_next_block(c, no_match); + ADDOP(c, POP_TOP); // match (None) + + compiler_use_next_block(c, except_with_error); if (i == n - 1) { /* Add exc to the list (if not None it's the unhandled part of the EG) */