Skip to content

GH-104580: No local eval breaker #104581

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
May 18, 2023
Merged

GH-104580: No local eval breaker #104581

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
f8eb171
Don't cache eval breaker in interpreter.
markshannon Mar 23, 2023
9b660e3
Merge branch 'main' into no-local-eval-breaker
markshannon May 12, 2023
4d1b4d4
Move eval-breaker to front of interpreter state.
markshannon May 12, 2023
b83b09d
Merge branch 'main' into no-local-eval-breaker
markshannon May 12, 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
Merge branch 'main' into no-local-eval-breaker
  • Loading branch information
@markshannon
markshannon committed May 12, 2023
commit 9b660e3a67da46ee59235f6093bd2fbebf1a1fa4
10 changes: 8 additions & 2 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,13 @@ dummy_func(
inst(RESUME, (--)) {
assert(tstate->cframe == &cframe);
assert(frame == cframe.current_frame);
if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {
/* Possibly combine this with eval breaker */
if (frame->f_code->_co_instrumentation_version != tstate->interp->monitoring_version) {
int err = _Py_Instrument(frame->f_code, tstate->interp);
ERROR_IF(err, error);
next_instr--;
}
else if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {
goto handle_eval_breaker;
}
}
Expand All @@ -162,7 +168,7 @@ dummy_func(
next_instr = frame->prev_instr;
DISPATCH();
}
if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {
if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {
goto handle_eval_breaker;
}
}
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.