bugfix: Keep registered types until after Py_Finalize(). Fix #4459 (#4486)

* Keep registered types until after Py_Finalize(). Fix #4459

* Address reviewer comments
This commit is contained in:
Aaron Gokaslan 2023-02-06 11:36:05 -05:00 committed by GitHub
parent 9ef65cee0e
commit b2c1978caa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -254,13 +254,16 @@ inline void finalize_interpreter() {
if (builtins.contains(id) && isinstance<capsule>(builtins[id])) { if (builtins.contains(id) && isinstance<capsule>(builtins[id])) {
internals_ptr_ptr = capsule(builtins[id]); internals_ptr_ptr = capsule(builtins[id]);
} }
// Local internals contains data managed by the current interpreter, so we must clear them to
// avoid undefined behaviors when initializing another interpreter
detail::get_local_internals().registered_types_cpp.clear();
detail::get_local_internals().registered_exception_translators.clear();
Py_Finalize(); Py_Finalize();
// Local internals contains data managed by the current interpreter, so we must clear them to
// avoid undefined behaviors when initializing another interpreter
// Must be cleared only after Py_Finalize() so atexit and other hooks can still use
// registered_types
detail::get_local_internals().registered_types_cpp.clear();
detail::get_local_internals().registered_exception_translators.clear();
if (internals_ptr_ptr) { if (internals_ptr_ptr) {
delete *internals_ptr_ptr; delete *internals_ptr_ptr;
*internals_ptr_ptr = nullptr; *internals_ptr_ptr = nullptr;