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

gaogaotiantian · Glyphack · commit c2a02b29f5e8 · 2024-01-27T10:36:18.000+01:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-14-20-15-57.gh-issue-107265.qHZL_6.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-14-20-15-57.gh-issue-107265.qHZL_6.rst
@@ -0,0 +1 @@
+Deopt opcodes hidden by the executor when base opcode is needed
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -1505,7 +1505,7 @@ deopt_code(PyCodeObject *code, _Py_CODEUNIT *instructions)
         int opcode = _Py_GetBaseOpcode(code, i);
         if (opcode == ENTER_EXECUTOR) {
             _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;
         }
         assert(opcode != ENTER_EXECUTOR);
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -306,7 +306,7 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)
     if (opcode == ENTER_EXECUTOR) {
         int exec_index = _PyCode_CODE(code)[offset].op.arg;
         _PyExecutorObject *exec = code->co_executors->executors[exec_index];
-        opcode = exec->vm_data.opcode;
+        opcode = _PyOpcode_Deopt[exec->vm_data.opcode];
 
     }
     assert(opcode != ENTER_EXECUTOR);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Deopt opcodes hidden by the executor when base opcode is needed`
Original file line number	Diff line number	Diff line change
`@@ -1505,7 +1505,7 @@ deopt_code(PyCodeObject code, _Py_CODEUNIT instructions)`
`1505`	`1505`	`int opcode = _Py_GetBaseOpcode(code, i);`
`1506`	`1506`	`if (opcode == ENTER_EXECUTOR) {`
`1507`	`1507`	`_PyExecutorObject *exec = code->co_executors->executors[instructions[i].op.arg];`
`1508`		`- opcode = exec->vm_data.opcode;`
	`1508`	`+ opcode = _PyOpcode_Deopt[exec->vm_data.opcode];`
`1509`	`1509`	`instructions[i].op.arg = exec->vm_data.oparg;`
`1510`	`1510`	`}`
`1511`	`1511`	`assert(opcode != ENTER_EXECUTOR);`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)`
`306`	`306`	`if (opcode == ENTER_EXECUTOR) {`
`307`	`307`	`int exec_index = _PyCode_CODE(code)[offset].op.arg;`
`308`	`308`	`_PyExecutorObject *exec = code->co_executors->executors[exec_index];`
`309`		`- opcode = exec->vm_data.opcode;`
	`309`	`+ opcode = _PyOpcode_Deopt[exec->vm_data.opcode];`
`310`	`310`
`311`	`311`	`}`
`312`	`312`	`assert(opcode != ENTER_EXECUTOR);`