diff options
author | Mark Shannon <mark@hotpy.org> | 2024-05-06 21:21:06 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-06 21:21:06 (GMT) |
commit | 616b745b89a52a1d27123107718f85e65918afdc (patch) | |
tree | 3e0c5691ed679c3d0008f87da0e8661077934a6e /Python | |
parent | 00d913c6718aa365027c6dcf850e8f40731e54fc (diff) | |
download | cpython-616b745b89a52a1d27123107718f85e65918afdc.zip cpython-616b745b89a52a1d27123107718f85e65918afdc.tar.gz cpython-616b745b89a52a1d27123107718f85e65918afdc.tar.bz2 |
GH-115709: Invalidate executors when a local variable is changed via frame.f_locals (#118639)
Also fix unrelated assert in debug Tier2/JIT builds.
Diffstat (limited to 'Python')
-rw-r--r-- | Python/bytecodes.c | 3 | ||||
-rw-r--r-- | Python/generated_cases.c.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index b2a0dc0..b2ddec9 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -2424,6 +2424,9 @@ dummy_func( opcode = executor->vm_data.opcode; oparg = (oparg & ~255) | executor->vm_data.oparg; next_instr = this_instr; + if (_PyOpcode_Caches[_PyOpcode_Deopt[opcode]]) { + PAUSE_ADAPTIVE_COUNTER(this_instr[1].counter); + } DISPATCH_GOTO(); } tstate->previous_executor = Py_None; diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 87098b0..d3126b0 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -2673,6 +2673,9 @@ opcode = executor->vm_data.opcode; oparg = (oparg & ~255) | executor->vm_data.oparg; next_instr = this_instr; + if (_PyOpcode_Caches[_PyOpcode_Deopt[opcode]]) { + PAUSE_ADAPTIVE_COUNTER(this_instr[1].counter); + } DISPATCH_GOTO(); } tstate->previous_executor = Py_None; |