diff options
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst | 2 | ||||
| -rw-r--r-- | Objects/frameobject.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst new file mode 100644 index 0000000..6384ef9 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst @@ -0,0 +1,2 @@ +Fix an issue where frame object manipulations could corrupt inline bytecode +caches. diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 3e97b75..fe8eaa3 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -603,7 +603,8 @@ add_load_fast_null_checks(PyCodeObject *co) int changed = 0; _Py_CODEUNIT *instructions = _PyCode_CODE(co); for (Py_ssize_t i = 0; i < Py_SIZE(co); i++) { - switch (_Py_OPCODE(instructions[i])) { + int opcode = _Py_OPCODE(instructions[i]); + switch (opcode) { case LOAD_FAST: case LOAD_FAST__LOAD_FAST: case LOAD_FAST__LOAD_CONST: @@ -619,6 +620,7 @@ add_load_fast_null_checks(PyCodeObject *co) _Py_SET_OPCODE(instructions[i], STORE_FAST); break; } + i += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]]; } if (changed) { // invalidate cached co_code object |