Move cleaning up of type info in internals to tp_dealloc on pybind11_metaclass

Author: YannickJadoul

include/pybind11/detail/class.h

@@ -193,6 +193,44 @@ extern "C" inline PyObject *pybind11_meta_call(PyObject *type, PyObject *args, P
     return self;
 }
 
+/// Cleanup the type-info for a pybind11-registered type.
+extern "C" inline void pybind11_meta_dealloc(PyObject *obj) {
+    auto *type = (PyTypeObject *) obj;
+    auto &internals = get_internals();
+
+    auto found_type = internals.registered_types_py.find(type);
+    if (found_type != internals.registered_types_py.end()) {
+        auto &all_tinfo = found_type->second;
+        for (auto *tinfo : all_tinfo) {
+            if (tinfo->type != type)
+                continue;
+
+        auto tindex = std::type_index(*tinfo->cpptype);
+        internals.direct_conversions.erase(tindex);
+
+        if (tinfo->module_local)
+            registered_local_types_cpp().erase(tindex);
+        else
+            internals.registered_types_cpp.erase(tindex);
+        internals.registered_types_py.erase(tinfo->type);
+
+        // Actually just `std::erase_if`, but that's only available in C++20
+        auto &cache = internals.inactive_override_cache;
+        for (auto it = cache.begin(), last = cache.end(); it != last; ) {
+            if (it->first == (PyObject *) tinfo->type)
+                it = cache.erase(it);
+            else
+                ++it;
+        }
+
+        delete tinfo;
+        break;
+        }
+    }
+
+    PyType_Type.tp_dealloc(obj);
+}
+
 /** This metaclass is assigned by default to all pybind11 types and is required in order
     for static properties to function correctly. Users may override this using `py::metaclass`.
     Return value: New reference. */
@@ -225,6 +263,8 @@ inline PyTypeObject* make_default_metaclass() {
     type->tp_getattro = pybind11_meta_getattro;
 #endif
 
+    type->tp_dealloc = pybind11_meta_dealloc;
+
     if (PyType_Ready(type) < 0)
         pybind11_fail("make_default_metaclass(): failure in PyType_Ready()!");
 

include/pybind11/pybind11.h

@@ -1021,30 +1021,6 @@ inline dict globals() {
 }
 
 PYBIND11_NAMESPACE_BEGIN(detail)
-/// Cleanup the type-info for a pybind11-registered type.
-PYBIND11_NOINLINE inline void cleanup_type_info(detail::type_info *tinfo) {
-    auto &internals = get_internals();
-    auto tindex = std::type_index(*tinfo->cpptype);
-    internals.direct_conversions.erase(tindex);
-
-    if (tinfo->module_local)
-        registered_local_types_cpp().erase(tindex);
-    else
-        internals.registered_types_cpp.erase(tindex);
-    internals.registered_types_py.erase(tinfo->type);
-
-    // Actually just `std::erase_if`, but that's only available in C++20
-    auto &cache = internals.inactive_override_cache;
-    for (auto it = cache.begin(), last = cache.end(); it != last; ) {
-        if (it->first == (PyObject *) tinfo->type)
-            it = cache.erase(it);
-        else
-            ++it;
-    }
-
-    delete tinfo;
-}
-
 /// Generic support for creating new Python heap types
 class generic_type : public object {
     template <typename...> friend class class_;
@@ -1086,12 +1062,6 @@ class generic_type : public object {
             internals.registered_types_cpp[tindex] = tinfo;
         internals.registered_types_py[(PyTypeObject *) m_ptr] = { tinfo };
 
-        // Clean up our internals after the Python type object gets garbage collected
-        weakref(m_ptr, cpp_function([tinfo](handle wr) {
-            cleanup_type_info(tinfo);
-            wr.dec_ref();
-        })).release();
-
         if (rec.bases.size() > 1 || rec.multiple_inheritance) {
             mark_parents_nonsimple(tinfo->type);
             tinfo->simple_ancestors = false;