Simplify PYBIND11_INTERNALS_VERSION >= 12

Author: XuehaiPan

include/pybind11/detail/class.h

@@ -226,14 +226,12 @@ extern "C" inline void pybind11_meta_dealloc(PyObject *obj) {
                 local_internals.registered_types_cpp.erase(tinfo->cpptype);
             } else {
                 internals.registered_types_cpp.erase(tindex);
-#if PYBIND11_INTERNALS_VERSION >= 12
                 internals.registered_types_cpp_fast.erase(tinfo->cpptype);
                 for (const std::type_info *alias : tinfo->alias_chain) {
                     auto num_erased = internals.registered_types_cpp_fast.erase(alias);
                     (void) num_erased;
                     assert(num_erased > 0);
                 }
-#endif
             }
             internals.registered_types_py.erase(tinfo->type);
 

include/pybind11/detail/internals.h

@@ -42,8 +42,8 @@
 #    define PYBIND11_INTERNALS_VERSION 12
 #endif
 
-#if PYBIND11_INTERNALS_VERSION < 11
-#    error "PYBIND11_INTERNALS_VERSION 11 is the minimum for all platforms for pybind11v3."
+#if PYBIND11_INTERNALS_VERSION < 12
+#    error "PYBIND11_INTERNALS_VERSION 12 is the minimum for all platforms for pybind11v3."
 #endif
 
 PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
@@ -273,14 +273,12 @@ struct internals {
     pymutex mutex;
     pymutex exception_translator_mutex;
 #endif
-#if PYBIND11_INTERNALS_VERSION >= 12
     // non-normative but fast "hint" for registered_types_cpp. Meant
     // to be used as the first level of a two-level lookup: successful
     // lookups are correct, but unsuccessful lookups need to try
     // registered_types_cpp and then backfill this map if they find
     // anything.
     fast_type_map<type_info *> registered_types_cpp_fast;
-#endif
 
     // std::type_index -> pybind11's type information
     type_map<type_info *> registered_types_cpp;
@@ -306,9 +304,6 @@ struct internals {
     PyObject *instance_base = nullptr;
     // Unused if PYBIND11_SIMPLE_GIL_MANAGEMENT is defined:
     thread_specific_storage<PyThreadState> tstate;
-#if PYBIND11_INTERNALS_VERSION <= 11
-    thread_specific_storage<loader_life_support> loader_life_support_tls; // OBSOLETE (PR #5830)
-#endif
     // Unused if PYBIND11_SIMPLE_GIL_MANAGEMENT is defined:
     PyInterpreterState *istate = nullptr;
 
@@ -396,7 +391,6 @@ struct type_info {
     void *(*module_local_load)(PyObject *, const type_info *) = nullptr;
     holder_enum_t holder_enum_v = holder_enum_t::undefined;
 
-#if PYBIND11_INTERNALS_VERSION >= 12
     // When a type appears in multiple DSOs,
     // internals::registered_types_cpp_fast will have multiple distinct
     // keys (the std::type_info from each DSO) mapped to the same
@@ -407,7 +401,6 @@ struct type_info {
     // nb_alias_chain` added in
     // https://github.com/wjakob/nanobind/commit/b515b1f7f2f4ecc0357818e6201c94a9f4cbfdc2
     std::forward_list<const std::type_info *> alias_chain;
-#endif
 
     /* A simple type never occurs as a (direct or indirect) parent
      * of a class that makes use of multiple inheritance.

include/pybind11/detail/type_caster_base.h

@@ -227,32 +227,26 @@ inline detail::type_info *get_global_type_info_lock_held(const std::type_info &t
     // next time.
     detail::type_info *type_info = nullptr;
     auto &internals = get_internals();
-#if PYBIND11_INTERNALS_VERSION >= 12
     auto &fast_types = internals.registered_types_cpp_fast;
-#endif
     auto &types = internals.registered_types_cpp;
-#if PYBIND11_INTERNALS_VERSION >= 12
     auto fast_it = fast_types.find(&tp);
     if (fast_it != fast_types.end()) {
-#    ifndef NDEBUG
+#ifndef NDEBUG
         auto types_it = types.find(std::type_index(tp));
         assert(types_it != types.end());
         assert(types_it->second == fast_it->second);
-#    endif
+#endif
         return fast_it->second;
     }
-#endif // PYBIND11_INTERNALS_VERSION >= 12
 
     auto it = types.find(std::type_index(tp));
     if (it != types.end()) {
-#if PYBIND11_INTERNALS_VERSION >= 12
         // We found the type in the slow map but not the fast one, so
         // some other DSO added it (otherwise it would be in the fast
         // map under &tp) and therefore we must be an alias. Record
         // that.
         it->second->alias_chain.push_front(&tp);
         fast_types.emplace(&tp, it->second);
-#endif
         type_info = it->second;
     }
     return type_info;

include/pybind11/gil_safe_call_once.h

@@ -196,4 +196,5 @@ class gil_safe_call_once_and_store {
     atomic_bool is_initialized_by_atleast_one_interpreter_{false};
 };
 #endif
+
 PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)

include/pybind11/pybind11.h

@@ -1692,9 +1692,7 @@ class generic_type : public object {
                 local_internals.registered_types_cpp[rec.type] = tinfo;
             } else {
                 internals.registered_types_cpp[tindex] = tinfo;
-#if PYBIND11_INTERNALS_VERSION >= 12
                 internals.registered_types_cpp_fast[rec.type] = tinfo;
-#endif
             }
 
             PYBIND11_WARNING_PUSH
@@ -2201,9 +2199,7 @@ class class_ : public detail::generic_type {
                     type_info *const val
                         = internals.registered_types_cpp[std::type_index(typeid(type))];
                     internals.registered_types_cpp[std::type_index(typeid(type_alias))] = val;
-#if PYBIND11_INTERNALS_VERSION >= 12
                     internals.registered_types_cpp_fast[&typeid(type_alias)] = val;
-#endif
                 }
             });
         }