Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-101517: fix line number propagation in code generated for except* (#103550)

This commit is contained in:
Irit Katriel 2023-04-24 14:58:51 -06:00 committed by GitHub
parent 518050ced1
commit 1c01f8d797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/bdb.py
View File

@ -574,6 +574,8 @@ class Bdb:
line = linecache.getline(filename, lineno, frame.f_globals) line = linecache.getline(filename, lineno, frame.f_globals)
if line: if line:
s += lprefix + line.strip() s += lprefix + line.strip()
else:
s += f'{lprefix}Warning: lineno is None'
return s return s
# The following methods can be called by clients to use # The following methods can be called by clients to use

3
Lib/test/test_bdb.py
View File

@ -1207,7 +1207,8 @@ class IssuesTestCase(BaseTestCase):
class TestRegressions(unittest.TestCase): class TestRegressions(unittest.TestCase):
def test_format_stack_entry_no_lineno(self): def test_format_stack_entry_no_lineno(self):
# See gh-101517 # 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__": if __name__ == "__main__":

4
Lib/test/test_pdb.py
View File

@ -1715,8 +1715,8 @@ def test_pdb_issue_gh_101517():
... 'continue' ... 'continue'
... ]): ... ]):
... test_function() ... test_function()
--Return-- > <doctest test.test_pdb.test_pdb_issue_gh_101517[0]>(5)test_function()
> <doctest test.test_pdb.test_pdb_issue_gh_101517[0]>(None)test_function()->None -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
(Pdb) continue (Pdb) continue
""" """

1
Misc/NEWS.d/next/Core and Builtins/2023-04-14-22-35-23.gh-issue-101517.5EqM-S.rst Normal file
View File

@ -0,0 +1 @@
Fix bug in line numbers of instructions emitted for :keyword:`except* <except_star>`.

32
Python/compile.c
View File

@ -3045,11 +3045,9 @@ compiler_try_except(struct compiler *c, stmt_ty s)
[orig, res, exc] <evaluate E1> [orig, res, exc] <evaluate E1>
[orig, res, exc, E1] CHECK_EG_MATCH [orig, res, exc, E1] CHECK_EG_MATCH
[orig, res, rest/exc, match?] COPY 1 [orig, res, rest/exc, match?] COPY 1
[orig, res, rest/exc, match?, match?] POP_JUMP_IF_NOT_NONE H1 [orig, res, rest/exc, match?, match?] POP_JUMP_IF_NONE C1
[orig, res, exc, None] POP_TOP
[orig, res, exc] JUMP L2
[orig, res, rest, match] H1: <assign to V1> (or POP if no V1) [orig, res, rest, match] <assign to V1> (or POP if no V1)
[orig, res, rest] SETUP_FINALLY R1 [orig, res, rest] SETUP_FINALLY R1
[orig, res, rest] <code for S1> [orig, res, rest] <code for S1>
@ -3057,8 +3055,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, v] R1: LIST_APPEND 3 ) exc raised in except* body - add to res
[orig, res, rest, i] POP [orig, res, rest, i] POP
[orig, res, rest] JUMP LE2
[orig, res, rest] L2: <evaluate E2> [orig, res, rest] L2: NOP ) for lineno
[orig, res, rest] JUMP LE2
[orig, res, rest/exc, None] C1: POP
[orig, res, rest] LE2: <evaluate E2>
.............................etc....................... .............................etc.......................
[orig, res, rest] Ln+1: LIST_APPEND 1 ) add unhandled exc to res (could be None) [orig, res, rest] Ln+1: LIST_APPEND 1 ) add unhandled exc to res (could be None)
@ -3114,7 +3118,8 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
location loc = LOC(handler); location loc = LOC(handler);
NEW_JUMP_TARGET_LABEL(c, next_except); NEW_JUMP_TARGET_LABEL(c, next_except);
except = next_except; except = next_except;
NEW_JUMP_TARGET_LABEL(c, handle_match); NEW_JUMP_TARGET_LABEL(c, except_with_error);
NEW_JUMP_TARGET_LABEL(c, no_match);
if (i == 0) { if (i == 0) {
/* create empty list for exceptions raised/reraise in the except* blocks */ /* create empty list for exceptions raised/reraise in the except* blocks */
/* /*
@ -3132,13 +3137,9 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
VISIT(c, expr, handler->v.ExceptHandler.type); VISIT(c, expr, handler->v.ExceptHandler.type);
ADDOP(c, loc, CHECK_EG_MATCH); ADDOP(c, loc, CHECK_EG_MATCH);
ADDOP_I(c, loc, COPY, 1); ADDOP_I(c, loc, COPY, 1);
ADDOP_JUMP(c, loc, POP_JUMP_IF_NOT_NONE, handle_match); ADDOP_JUMP(c, loc, POP_JUMP_IF_NONE, no_match);
ADDOP(c, loc, POP_TOP); // match
ADDOP_JUMP(c, loc, JUMP, except);
} }
USE_LABEL(c, handle_match);
NEW_JUMP_TARGET_LABEL(c, cleanup_end); NEW_JUMP_TARGET_LABEL(c, cleanup_end);
NEW_JUMP_TARGET_LABEL(c, cleanup_body); NEW_JUMP_TARGET_LABEL(c, cleanup_body);
@ -3197,9 +3198,16 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
/* add exception raised to the res list */ /* add exception raised to the res list */
ADDOP_I(c, NO_LOCATION, LIST_APPEND, 3); // exc ADDOP_I(c, NO_LOCATION, LIST_APPEND, 3); // exc
ADDOP(c, NO_LOCATION, POP_TOP); // lasti ADDOP(c, NO_LOCATION, POP_TOP); // lasti
ADDOP_JUMP(c, NO_LOCATION, JUMP, except); ADDOP_JUMP(c, NO_LOCATION, JUMP, except_with_error);
USE_LABEL(c, except); USE_LABEL(c, except);
ADDOP(c, NO_LOCATION, NOP); // to hold a propagated location info
ADDOP_JUMP(c, NO_LOCATION, JUMP, except_with_error);
USE_LABEL(c, no_match);
ADDOP(c, loc, POP_TOP); // match (None)
USE_LABEL(c, except_with_error);
if (i == n - 1) { if (i == n - 1) {
/* Add exc to the list (if not None it's the unhandled part of the EG) */ /* Add exc to the list (if not None it's the unhandled part of the EG) */