Skip to content

gh-109094: remove unnecessary updates of frame->prev_instr in instrumentation functions #109076

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 4 commits into from
Sep 7, 2023
Merged

gh-109094: remove unnecessary updates of frame->prev_instr in instrumentation functions #109076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd1bc94
assert lineno and lasti agree. Remove prev_instr setting in _Py_call_…
iritkatriel Sep 7, 2023
9d47c97
assert in jump tracer and all event in the line tracer
iritkatriel Sep 7, 2023
a50201b
remove commented out code and turn assignment to assertion
iritkatriel Sep 7, 2023
88996da
Merge branch 'main' into instrumentation
iritkatriel Sep 7, 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
assert lineno and lasti agree. Remove prev_instr setting in _Py_call_… 
…instrumentation_jump
  • Loading branch information
@iritkatriel
iritkatriel committed Sep 7, 2023
commit fd1bc9412e48dc7bc0a6f4aef27f3af5c6cc96ab
9 changes: 9 additions & 0 deletions Lib/test/test_sys_settrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,13 @@ def generator_example():
[(5, 'line'), (5, 'return')])


def lineno_matches_lasti(frame):
last_line = None
for start, end, line in frame.f_code.co_lines():
if start <= frame.f_lasti < end:
last_line = line
return last_line == frame.f_lineno

class Tracer:
def __init__(self, trace_line_events=None, trace_opcode_events=None):
self.trace_line_events = trace_line_events
Expand All @@ -316,6 +323,8 @@ def _reconfigure_frame(self, frame):
frame.f_trace_opcodes = self.trace_opcode_events

def trace(self, frame, event, arg):
if event == 'line':
assert lineno_matches_lasti(frame)
self._reconfigure_frame(frame)
self.events.append((frame.f_lineno, event))
return self.trace
Expand Down
6 changes: 3 additions & 3 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ _Py_call_instrumentation_jump(
event == PY_MONITORING_EVENT_BRANCH);
assert(frame->prev_instr == instr);
/* Event should occur after the jump */
frame->prev_instr = target;
// frame->prev_instr = target;
PyCodeObject *code = _PyFrame_GetCode(frame);
int to = (int)(target - _PyCode_CODE(code));
PyObject *to_obj = PyLong_FromLong(to * (int)sizeof(_Py_CODEUNIT));
Expand All @@ -1071,12 +1071,12 @@ _Py_call_instrumentation_jump(
if (err) {
return NULL;
}
if (frame->prev_instr != target) {
if (frame->prev_instr != instr) {
/* The callback has caused a jump (by setting the line number) */
return frame->prev_instr;
}
/* Reset prev_instr for INSTRUMENTED_LINE */
frame->prev_instr = instr;
// frame->prev_instr = instr;
return target;
}

Expand Down