Skip to content

bpo-24565: f->f_lineno is now -1 when tracing is not set #12419

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

Closed
xdegaye wants to merge 5 commits into from
Closed

bpo-24565: f->f_lineno is now -1 when tracing is not set #12419

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a49be2
bpo-24565: f->f_lineno is now -1 when tracing is not set
xdegaye Mar 25, 2018
32e6a2c
call PyFrame_GetLineNumber() in maybe_dtrace_line() only when needed
xdegaye Mar 25, 2018
f85e23c
Merge branch 'master' into bpo-24565
xdegaye Mar 18, 2019
40bf7f7
Set f_lineno upon trace call events
xdegaye Apr 8, 2019
dd9f664
Merge branch 'master' into bpo-24565
xdegaye May 13, 2019
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
call PyFrame_GetLineNumber() in maybe_dtrace_line() only when needed
  • Loading branch information
@xdegaye
xdegaye committed Mar 25, 2018
commit 32e6a2cbeeb633111773aeaad470c17cdfe0f36f
8 changes: 4 additions & 4 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5094,7 +5094,7 @@ static void
maybe_dtrace_line(PyFrameObject *frame,
int *instr_lb, int *instr_ub, int *instr_prev)
{
int line;
int line = -1;
const char *co_filename, *co_name;

/* If the last instruction executed isn't in the current
Expand All @@ -5106,14 +5106,14 @@ maybe_dtrace_line(PyFrameObject *frame,
&bounds);
*instr_lb = bounds.ap_lower;
*instr_ub = bounds.ap_upper;
} else {
line = PyFrame_GetLineNumber(frame);
}

/* 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 call the trace function. */
if (frame->f_lasti == *instr_lb || frame->f_lasti < *instr_prev) {
if (line == -1) {
line = PyFrame_GetLineNumber(frame);
}
co_filename = PyUnicode_AsUTF8(frame->f_code->co_filename);
if (!co_filename)
co_filename = "?";
Expand Down