Skip to content

gh-107265: Fix _PyFrame_OpAlreadyRan for ENTER_EXECUTOR case #111645

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

Closed
wants to merge 3 commits into from
Closed

gh-107265: Fix _PyFrame_OpAlreadyRan for ENTER_EXECUTOR case #111645

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05cee5d
gh-107265: Fix _PyFrame_OpAlreadyRan for ENTER_EXECUTOR case
corona10 Nov 2, 2023
27138c9
Add _PyOpcode_Deopt for exec->vm_data.opcode
corona10 Nov 2, 2023
db105b9
nit
corona10 Nov 2, 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
20 changes: 17 additions & 3 deletions Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,13 +1090,27 @@ static int
_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame, int opcode, int oparg)
{
// This only works when opcode is a non-quickened form:
assert(opcode != ENTER_EXECUTOR);
assert(_PyOpcode_Deopt[opcode] == opcode);
int check_oparg = 0;
for (_Py_CODEUNIT *instruction = _PyCode_CODE(_PyFrame_GetCode(frame));
PyCodeObject *code = _PyFrame_GetCode(frame);
for (_Py_CODEUNIT *instruction = _PyCode_CODE(code);
instruction < frame->instr_ptr; instruction++)
{
int check_opcode = _PyOpcode_Deopt[instruction->op.code];
check_oparg |= instruction->op.arg;
int check_opcode = -1;
if (instruction->op.code == ENTER_EXECUTOR) {
int exec_index = instruction->op.arg;
_PyExecutorObject *exec = code->co_executors->executors[exec_index];
check_opcode = _PyOpcode_Deopt[exec->vm_data.opcode];
check_oparg |= exec->vm_data.oparg;
}
else {
check_opcode = _PyOpcode_Deopt[instruction->op.code];
check_oparg |= instruction->op.arg;
}

assert(check_opcode != ENTER_EXECUTOR);

if (check_opcode == opcode && check_oparg == oparg) {
return 1;
}
Expand Down