Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 5 commits into from
Apr 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb2b5a5
gh-101517: fix line number propagation in code generated for except*
iritkatriel Apr 14, 2023
58c883e
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 14, 2023
073c860
add warning to s
iritkatriel Apr 14, 2023
6f4c26c
Add prefix
iritkatriel Apr 14, 2023
293cefe
Merge branch 'main' into propagate_linenos
iritkatriel Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-101517: fix line number propagation in code generated for except*
  • Loading branch information
@iritkatriel
iritkatriel committed Apr 14, 2023
commit eb2b5a5fe91eb022334ba5f1fa42095ffc271f9d
2 changes: 2 additions & 0 deletions Lib/bdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
print('bdb.Bdb.format_stack_entry: lineno is None')
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
return s

# The following methods can be called by clients to use
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,8 +1715,8 @@ def test_pdb_issue_gh_101517():
... 'continue'
... ]):
... test_function()
--Return--
> <doctest test.test_pdb.test_pdb_issue_gh_101517[0]>(None)test_function()->None
> <doctest test.test_pdb.test_pdb_issue_gh_101517[0]>(5)test_function()
-> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
(Pdb) continue
"""

Expand Down
32 changes: 20 additions & 12 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3045,20 +3045,24 @@ compiler_try_except(struct compiler *c, stmt_ty s)
[orig, res, exc] <evaluate E1>
[orig, res, exc, E1] CHECK_EG_MATCH
[orig, res, rest/exc, match?] COPY 1
[orig, res, rest/exc, match?, match?] POP_JUMP_IF_NOT_NONE H1
[orig, res, exc, None] POP_TOP
[orig, res, exc] JUMP L2
[orig, res, rest/exc, match?, match?] POP_JUMP_IF_NONE C1

[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] <code for S1>
[orig, res, rest] JUMP L2

[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: <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.......................

[orig, res, rest] Ln+1: LIST_APPEND 1 ) add unhandled exc to res (could be None)
Expand Down Expand Up @@ -3114,7 +3118,8 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
location loc = LOC(handler);
NEW_JUMP_TARGET_LABEL(c, 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) {
/* create empty list for exceptions raised/reraise in the except* blocks */
/*
Expand All @@ -3132,13 +3137,9 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
VISIT(c, expr, handler->v.ExceptHandler.type);
ADDOP(c, loc, CHECK_EG_MATCH);
ADDOP_I(c, loc, COPY, 1);
ADDOP_JUMP(c, loc, POP_JUMP_IF_NOT_NONE, handle_match);
ADDOP(c, loc, POP_TOP); // match
ADDOP_JUMP(c, loc, JUMP, except);
ADDOP_JUMP(c, loc, POP_JUMP_IF_NONE, no_match);
}

USE_LABEL(c, handle_match);

NEW_JUMP_TARGET_LABEL(c, cleanup_end);
NEW_JUMP_TARGET_LABEL(c, cleanup_body);

Expand Down Expand Up @@ -3197,9 +3198,16 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
/* add exception raised to the res list */
ADDOP_I(c, NO_LOCATION, LIST_APPEND, 3); // exc
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);
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) {
/* Add exc to the list (if not None it's the unhandled part of the EG) */
Expand Down