Fix a bug

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -47,6 +47,8 @@ typedef struct _PyExitData {
 typedef struct _PyExecutorObject {
     PyObject_VAR_HEAD
     const _PyUOpInstruction *trace;
+    // The interpreter this executor belongs to.
+    PyInterpreterState *interp;
     _PyVMData vm_data; /* Used by the VM, but opaque to the optimizer */
     uint32_t exit_count;
     uint32_t code_size;

Python/optimizer.c

@@ -1647,8 +1647,11 @@ unlink_executor(_PyExecutorObject *executor)
         prev->vm_data.links.next = next;
     }
     else {
-        // prev == NULL implies that executor is the list head
-        PyInterpreterState *interp = PyInterpreterState_Get();
+        // prev == NULL often implies that executor is the list head
+        // Note that we should *not* get the current interpreter, as
+        // that may not always correspond to the interpreter this executor
+        // belongs to.
+        PyInterpreterState *interp = executor->interp;
         assert(interp->executor_list_head == executor);
         interp->executor_list_head = next;
     }
@@ -1663,6 +1666,7 @@ _Py_ExecutorInit(_PyExecutorObject *executor, const _PyBloomFilter *dependency_s
     for (int i = 0; i < _Py_BLOOM_FILTER_WORDS; i++) {
         executor->vm_data.bloom.bits[i] = dependency_set->bits[i];
     }
+    executor->interp = _PyInterpreterState_GET();
     link_executor(executor);
 }