From e38c5536e1e6a1669b568453516df4f7f55a4227 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sun, 20 Aug 2023 20:05:26 +0900 Subject: [PATCH] gh-107265: Fix code_richcompare to lookup actual opcode when ENTER_EXECUTOR --- Objects/codeobject.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 4d6efe938f45d6..0864fdd77d06de 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1781,8 +1781,23 @@ code_richcompare(PyObject *self, PyObject *other, int op) for (int i = 0; i < Py_SIZE(co); i++) { _Py_CODEUNIT co_instr = _PyCode_CODE(co)[i]; _Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i]; + + if (co_instr.op.code == ENTER_EXECUTOR) { + const int exec_index = co_instr.op.arg; + _PyExecutorObject *exec = co->co_executors->executors[exec_index]; + co_instr.op.code = exec->vm_data.opcode; + } + assert(co_instr.op.code != ENTER_EXECUTOR); co_instr.op.code = _PyOpcode_Deopt[co_instr.op.code]; + + if (cp_instr.op.code == ENTER_EXECUTOR) { + const int exec_index = cp_instr.op.arg; + _PyExecutorObject *exec = cp->co_executors->executors[exec_index]; + cp_instr.op.code = exec->vm_data.opcode; + } + assert(cp_instr.op.code != ENTER_EXECUTOR); cp_instr.op.code = _PyOpcode_Deopt[cp_instr.op.code]; + eq = co_instr.cache == cp_instr.cache; if (!eq) { goto unequal;