mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

GH-107265: Add missing deoptimizations for ENTER_EXECUTOR's original opcode (GH-109420)

Browse source
This commit is contained in:
Tian Gao 2023-09-22 14:13:31 -07:00 • committed by GitHub
parent 8ded34a1ff
commit d5611f2804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2023-09-14-20-15-57.gh-issue-107265.qHZL_6.rst Normal file
View file

@ -0,0 +1 @@
Deopt opcodes hidden by the executor when base opcode is needed

2
Objects/codeobject.c
View file

@ -1505,7 +1505,7 @@ deopt_code(PyCodeObject *code, _Py_CODEUNIT *instructions)
int opcode = _Py_GetBaseOpcode(code, i); int opcode = _Py_GetBaseOpcode(code, i);
if (opcode == ENTER_EXECUTOR) { if (opcode == ENTER_EXECUTOR) {
_PyExecutorObject *exec = code->co_executors->executors[instructions[i].op.arg]; _PyExecutorObject *exec = code->co_executors->executors[instructions[i].op.arg];
opcode = exec->vm_data.opcode; opcode = _PyOpcode_Deopt[exec->vm_data.opcode];
instructions[i].op.arg = exec->vm_data.oparg; instructions[i].op.arg = exec->vm_data.oparg;
} }
assert(opcode != ENTER_EXECUTOR); assert(opcode != ENTER_EXECUTOR);

2
Python/instrumentation.c
View file

@ -306,7 +306,7 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)
if (opcode == ENTER_EXECUTOR) { if (opcode == ENTER_EXECUTOR) {
int exec_index = _PyCode_CODE(code)[offset].op.arg; int exec_index = _PyCode_CODE(code)[offset].op.arg;
_PyExecutorObject *exec = code->co_executors->executors[exec_index]; _PyExecutorObject *exec = code->co_executors->executors[exec_index];
opcode = exec->vm_data.opcode; opcode = _PyOpcode_Deopt[exec->vm_data.opcode];
} }
assert(opcode != ENTER_EXECUTOR); assert(opcode != ENTER_EXECUTOR);