gh-107082: Fix instruction size computation for ENTER_EXECUTOR (#107256)

gvanrossum · vstinner · web-flow · commit 233b87828869 · 2023-07-25T20:01:02.000Z
Co-authored-by: Victor Stinner &lt;vstinner@python.org&gt;
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -276,6 +276,13 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)
     }
     assert(opcode != 0);
     assert(!is_instrumented(opcode));
+    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;
+
+    }
+    assert(opcode != ENTER_EXECUTOR);
     assert(opcode == _PyOpcode_Deopt[opcode]);
     return 1 + _PyOpcode_Caches[opcode];
 }

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,13 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)`
`276`	`276`	`}`
`277`	`277`	`assert(opcode != 0);`
`278`	`278`	`assert(!is_instrumented(opcode));`
	`279`	`+ if (opcode == ENTER_EXECUTOR) {`
	`280`	`+ int exec_index = _PyCode_CODE(code)[offset].op.arg;`
	`281`	`+ _PyExecutorObject *exec = code->co_executors->executors[exec_index];`
	`282`	`+ opcode = exec->vm_data.opcode;`
	`283`	`+`
	`284`	`+ }`
	`285`	`+ assert(opcode != ENTER_EXECUTOR);`
`279`	`286`	`assert(opcode == _PyOpcode_Deopt[opcode]);`
`280`	`287`	`return 1 + _PyOpcode_Caches[opcode];`
`281`	`288`	`}`