diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-10-04 15:09:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 15:09:48 (GMT) |
| commit | bf4bc36069ef1ed4be4be2ae70404f78bff056d9 (patch) | |
| tree | 1921d692061fdc40d967f1f7b6defa6bb7a01bc4 /Python/executor_cases.c.h | |
| parent | 7c149a76b2bf4c66bb7c8650ffb71acce12f5ea2 (diff) | |
| download | cpython-bf4bc36069ef1ed4be4be2ae70404f78bff056d9.zip cpython-bf4bc36069ef1ed4be4be2ae70404f78bff056d9.tar.gz cpython-bf4bc36069ef1ed4be4be2ae70404f78bff056d9.tar.bz2 | |
GH-109369: Merge all eval-breaker flags and monitoring version into one word. (GH-109846)
Diffstat (limited to 'Python/executor_cases.c.h')
| -rw-r--r-- | Python/executor_cases.c.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index b3ccf8d..c6eeee4 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -12,9 +12,10 @@ DEOPT_IF(_Py_emscripten_signal_clock == 0, RESUME); _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING; #endif - /* Possibly combine these two checks */ - DEOPT_IF(_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version, RESUME); - DEOPT_IF(_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker), RESUME); + uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker); + uintptr_t version = _PyFrame_GetCode(frame)->_co_instrumentation_version; + assert((version & _PY_EVAL_EVENTS_MASK) == 0); + DEOPT_IF(eval_breaker != version, RESUME); break; } |