Fix instruction size computation for ENTER_EXECUTOR

gvanrossum · gvanrossum · commit 92b493d4cd0a · 2023-07-25T11:01:05.000-07:00
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -276,6 +276,12 @@ _PyInstruction_GetLength(PyCodeObject *code, int offset)
     }
     assert(opcode != 0);
     assert(!is_instrumented(opcode));
+    if (opcode == ENTER_EXECUTOR) {
+        _PyExecutorObject *exec = code->co_executors->executors[_PyCode_CODE(code)[offset].op.arg];
+        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,12 @@ _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`	`+ _PyExecutorObject *exec = code->co_executors->executors[_PyCode_CODE(code)[offset].op.arg];`
	`281`	`+ opcode = exec->vm_data.opcode;`
	`282`	`+`
	`283`	`+ }`
	`284`	`+ assert(opcode != ENTER_EXECUTOR);`
`279`	`285`	`assert(opcode == _PyOpcode_Deopt[opcode]);`
`280`	`286`	`return 1 + _PyOpcode_Caches[opcode];`
`281`	`287`	`}`