Skip to content

gh-108976: Make sure instrumentation line returns the correct opcode when instruction instrumentation is stripped #109043

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
gaogaotiantian wants to merge 4 commits into from
Closed

gh-108976: Make sure instrumentation line returns the correct opcode when instruction instrumentation is stripped #109043

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a67909f
Make sure instrumentation line returns the correct opcode even
gaogaotiantian Sep 6, 2023
0bc904e
Fix it for both sys.monitoring and sys.settrace
gaogaotiantian Sep 7, 2023
7ee7d1d
Add regression tests
gaogaotiantian Sep 7, 2023
c2b32e4
📜🤖 Added by blurb_it.
blurb-it[bot] 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
Prev Previous commit
Next Next commit
Fix it for both sys.monitoring and sys.settrace
  • Loading branch information
@gaogaotiantian
gaogaotiantian committed Sep 7, 2023
commit 0bc904e355cf1a8beaa08e0536be8343d724ae62
19 changes: 11 additions & 8 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,14 +1190,6 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
if (err) {
return -1;
}
// If trace is disabled in trace function, we need to recalculate the original opcode
// of the current instruction because it might be INSTRUMENTED_INSTRUCTION before the
// trace function.
if (tstate->interp->sys_tracing_threads == 0) {
if (original_opcode == INSTRUMENTED_INSTRUCTION) {
original_opcode = instr->op.code;
}
}
}
}
tools &= (255 - (1 << PY_MONITORING_SYS_TRACE_ID));
Expand Down Expand Up @@ -1231,8 +1223,19 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
remove_line_tools(code, i, 1 << tool);
}
} while (tools);

Py_DECREF(line_obj);
done:
// original_opcode is acquired before trace function and the callbacks. It's
// possible that the trace function or the callbacks turn off the instruction
// monitoring. If the instruction instrumentation is stripped, using the
// opcode could crash the interpreter. We should use the original opcode
// instead.
if (monitoring->active_monitors.tools[PY_MONITORING_EVENT_INSTRUCTION] == 0 &&
original_opcode == INSTRUMENTED_INSTRUCTION) {
original_opcode = instr->op.code;
}

assert(original_opcode != 0);
assert(original_opcode != INSTRUMENTED_LINE);
assert(_PyOpcode_Deopt[original_opcode] == original_opcode);
Expand Down