Call drop_owned() after Py_EndInterpreter(), not before.

ericsnowcurrently · ericsnowcurrently · commit c4d7d322bc32 · 2024-04-08T20:23:48.000-06:00
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -550,9 +550,8 @@ add_owned(owned_ids *owned, PyInterpreterState *interp)
 }
 
 static void
-drop_owned(owned_ids *owned, PyInterpreterState *interp)
+drop_owned(owned_ids *owned, int64_t interpid)
 {
-    int64_t id = PyInterpreterState_GetID(interp);
 #if sizeof(int64_t) <= sizeof(Py_uhash_t)
     _Py_hashtable_steal(owned_ids, (const void *)id);
 #else
@@ -758,6 +757,7 @@ interp_destroy(PyObject *self, PyObject *args, PyObject *kwds)
     if (interp == NULL) {
         return NULL;
     }
+    int64_t interpid = PyInterpreterState_GetID(interp);
 
     // Ensure we don't try to destroy the current interpreter.
     PyInterpreterState *current = _get_current_interp();
@@ -778,11 +778,11 @@ interp_destroy(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    drop_owned(&_globals.owned, interp);
-
     // Destroy the interpreter.
     _PyXI_EndInterpreter(interp, NULL, NULL);
 
+    drop_owned(&_globals.owned, interpid);
+
     Py_RETURN_NONE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -550,9 +550,8 @@ add_owned(owned_ids owned, PyInterpreterState interp)`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`static void`
`553`		`-drop_owned(owned_ids owned, PyInterpreterState interp)`
	`553`	`+drop_owned(owned_ids *owned, int64_t interpid)`
`554`	`554`	`{`
`555`		`- int64_t id = PyInterpreterState_GetID(interp);`
`556`	`555`	`#if sizeof(int64_t) <= sizeof(Py_uhash_t)`
`557`	`556`	`_Py_hashtable_steal(owned_ids, (const void *)id);`
`558`	`557`	`#else`
`@@ -758,6 +757,7 @@ interp_destroy(PyObject self, PyObject args, PyObject *kwds)`
`758`	`757`	`if (interp == NULL) {`
`759`	`758`	`return NULL;`
`760`	`759`	`}`
	`760`	`+ int64_t interpid = PyInterpreterState_GetID(interp);`
`761`	`761`
`762`	`762`	`// Ensure we don't try to destroy the current interpreter.`
`763`	`763`	`PyInterpreterState *current = _get_current_interp();`
`@@ -778,11 +778,11 @@ interp_destroy(PyObject self, PyObject args, PyObject *kwds)`
`778`	`778`	`return NULL;`
`779`	`779`	`}`
`780`	`780`
`781`		`- drop_owned(&_globals.owned, interp);`
`782`		`-`
`783`	`781`	`// Destroy the interpreter.`
`784`	`782`	`_PyXI_EndInterpreter(interp, NULL, NULL);`
`785`	`783`
	`784`	`+ drop_owned(&_globals.owned, interpid);`
	`785`	`+`
`786`	`786`	`Py_RETURN_NONE;`
`787`	`787`	`}`
`788`	`788`