10000 bpo-42823: Fix frame lineno when frame.f_trace is set by markshannon · Pull Request #24099 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-42823: Fix frame lineno when frame.f_trace is set #24099

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
merged 6 commits into from
Jan 5, 2021
Merged

bpo-42823: Fix frame lineno when frame.f_trace is set #24099

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60b5a03
Add test for frame.f_lineno with/without tracing.
markshannon Jan 4, 2021
2634396
Make sure that frame.f_lineno is correct regardless of whether frame.…
markshannon Jan 4, 2021
d49fd20
Update importlib
markshannon Jan 4, 2021
5c4d701
Add NEWS
markshannon Jan 4, 2021
22b8c99
Restore comment indentation.
markshannon Jan 5, 2021
5028a2e
Clarify logic about what instructions to line trace.
markshannon Jan 5, 2021
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
Prev Previous commit
Next Next commit
Restore comment indentation.
  • Loading branch information
@markshannon
markshannon committed Jan 5, 2021
commit 22b8c992ea2075d2507bd5c267411a276de1bc29
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4995,8 +4995,8 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
int result = 0;

/* If the last instruction falls at the start of a line or if it
represents a jump backwards, update the frame's line number and
then call the trace function if we're tracing source lines.
represents a jump backwards, update the frame's line number and
then call the trace function if we're tracing source lines.
*/
int lastline = bounds->ar_line;
int line = _PyCode_CheckLineNumber(frame->f_lasti, bounds);
Expand Down
0