FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.11] gh-101400: Fix incorrect lineno in exception message on contin… by corona10 · Pull Request #101447 · python/cpython · GitHub

/ cpython Public

[3.11] gh-101400: Fix incorrect lineno in exception message on contin… - #101447

Merged
corona10 merged 4 commits into
python:3.11from
corona10:backport-e867c1b-3.11
Jan 31, 2023
ConversationCommits (4)ChecksFiles changed
Merged

[3.11] gh-101400: Fix incorrect lineno in exception message on contin…#101447
corona10 merged 4 commits into
python:3.11from
corona10:backport-e867c1b-3.11

Conversation

corona10 commented Jan 31, 2023 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

…ue/break which are not in a loop (GH-101413).

(cherry picked from commit e867c1b)

Co-authored-by: Dong-hee Na donghee.na@python.org

corona10 requested a review from markshannon as a code owner January 31, 2023 03:33
This was referenced Jan 31, 2023
Closed
Merged
corona10 requested a review from iritkatriel January 31, 2023 03:33
[3.11] pythongh-101400: Fix incorrect lineno in exception message on …
2aa4010 
…continue/break which are not in a loop (pythonGH-101413).

(cherry picked from commit e867c1b)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
corona10 force-pushed the backport-e867c1b-3.11 branch from 4e1f5bf to 2aa4010 Compare January 31, 2023 05:37

corona10 commented Jan 31, 2023

Copy link
Copy Markdown
Member Author

We need to apply slightly different patches for 3.1[0-2]
For 3.11, when considering following the code line.

cpython/Python/compile.c

Lines 2060 to 2080 in 2aa4010

case WITH:
case ASYNC_WITH:
SET_LOC(c, (stmt_ty)info->fb_datum);
ADDOP(c, POP_BLOCK);
if (preserve_tos) {
ADDOP_I(c, SWAP, 2);
}
if(!compiler_call_exit_with_nones(c)) {
return 0;
}
if (info->fb_type == ASYNC_WITH) {
ADDOP_I(c, GET_AWAITABLE, 2);
ADDOP_LOAD_CONST(c, Py_None);
ADD_YIELD_FROM(c, 1);
}
ADDOP(c, POP_TOP);
/* The exit block should appear to execute after the
* statement causing the unwinding, so make the unwinding
* instruction artificial */
UNSET_LOC(c);
return 1;

I restore the whole compiler_unit.

corona10 force-pushed the backport-e867c1b-3.11 branch from ff0cf41 to ca4887d Compare January 31, 2023 05:42
iritkatriel reviewed Jan 31, 2023
View reviewed changes
Comment thread Python/compile.c Outdated
corona10 requested a review from iritkatriel January 31, 2023 13:36
iritkatriel reviewed Jan 31, 2023
View reviewed changes
Comment thread Python/compile.c Outdated
corona10 requested a review from iritkatriel January 31, 2023 14:20
corona10 merged commit 0c37ea9 into python:3.11 Jan 31, 2023
corona10 deleted the backport-e867c1b-3.11 branch January 31, 2023 14:54
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

iritkatriel iritkatriel approved these changes
markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL