Skip to content

bpo-43760: Check for tracing using 'bitwise or' instead of branch in dispatch. #28723

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
markshannon merged 4 commits into from
Oct 5, 2021
Merged

bpo-43760: Check for tracing using 'bitwise or' instead of branch in dispatch. #28723

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d98c170
Check for tracing using 'bitwise or' instead of branch in dispatch.
markshannon Oct 1, 2021
65f42c4
Restore dtrace supoort.
markshannon Oct 4, 2021
a9ff904
Add NEWS
markshannon Oct 4, 2021
e8df4ed
Remove artifacts from NEWS entry.
markshannon Oct 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 dtrace supoort.
  • Loading branch information
@markshannon
markshannon committed Oct 4, 2021
commit 65f42c4bc7497a96836430097e9df6dc0bd992d8
6 changes: 3 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
#endif

#ifdef WITH_DTRACE
#define OR_DTRACE_LINE || PyDTrace_LINE_ENABLED()
#define OR_DTRACE_LINE | (PyDTrace_LINE_ENABLED() ? 255 : 0)
#else
#define OR_DTRACE_LINE
#endif
Expand Down Expand Up @@ -1292,7 +1292,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
NEXTOPARG(); \
PRE_DISPATCH_GOTO(); \
assert(cframe.use_tracing == 0 || cframe.use_tracing == 255); \
opcode |= cframe.use_tracing; \
opcode |= cframe.use_tracing OR_DTRACE_LINE; \
DISPATCH_GOTO(); \
}

Expand Down Expand Up @@ -1363,7 +1363,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
#define PREDICT(op) \
do { \
_Py_CODEUNIT word = *next_instr; \
opcode = _Py_OPCODE(word) | cframe.use_tracing; \
opcode = _Py_OPCODE(word) | cframe.use_tracing OR_DTRACE_LINE; \
if (opcode == op) { \
oparg = _Py_OPARG(word); \
INSTRUCTION_START(); \
Expand Down