gh-104584: Replace ENTER_EXECUTOR with the original in trace projection (#106526)

gvanrossum · web-flow · commit 80b9b3a51757 · 2023-07-07T11:41:42.000-07:00
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -419,6 +419,12 @@ translate_bytecode_to_trace(
             opcode = instr->op.code;
             oparg = (oparg << 8) | instr->op.arg;
         }
+        if (opcode == ENTER_EXECUTOR) {
+            _PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[oparg&255];
+            opcode = executor->vm_data.opcode;
+            DPRINTF(2, "  * ENTER_EXECUTOR -> %s\n",  _PyOpcode_OpName[opcode]);
+            oparg = (oparg & 0xffffff00) | executor->vm_data.oparg;
+        }
         switch (opcode) {
             default:
             {

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,12 @@ translate_bytecode_to_trace(`
`419`	`419`	`opcode = instr->op.code;`
`420`	`420`	`oparg = (oparg << 8) \| instr->op.arg;`
`421`	`421`	`}`
	`422`	`+ if (opcode == ENTER_EXECUTOR) {`
	`423`	`+ _PyExecutorObject executor = (_PyExecutorObject )code->co_executors->executors[oparg&255];`
	`424`	`+ opcode = executor->vm_data.opcode;`
	`425`	`+ DPRINTF(2, " * ENTER_EXECUTOR -> %s\n", _PyOpcode_OpName[opcode]);`
	`426`	`+ oparg = (oparg & 0xffffff00) \| executor->vm_data.oparg;`
	`427`	`+ }`
`422`	`428`	`switch (opcode) {`
`423`	`429`	`default:`
`424`	`430`	`{`