Make clang-tidy happy

Author: b-pass

include/pybind11/detail/internals.h

@@ -103,8 +103,8 @@ class thread_specific_storage {
 
     T *get() const { return reinterpret_cast<T *>(PYBIND11_TLS_GET_VALUE(key_)); }
 
-    operator T *() const { return get(); }
     T &operator*() const { return *get(); }
+    explicit operator T *() const { return get(); }
     explicit operator bool() const { return get() != nullptr; }
 
     void set(T *val) { PYBIND11_TLS_REPLACE_VALUE(key_, reinterpret_cast<void *>(val)); }
@@ -227,7 +227,7 @@ struct internals {
     std::unordered_map<PyTypeObject *, std::vector<type_info *>> registered_types_py;
 #ifdef Py_GIL_DISABLED
     std::unique_ptr<instance_map_shard[]> instance_shards; // void * -> instance*
-    size_t instance_shards_mask;
+    size_t instance_shards_mask = 0;
 #else
     instance_map registered_instances; // void * -> instance*
 #endif
@@ -251,14 +251,14 @@ struct internals {
 
     type_map<PyObject *> native_enum_type_map;
 
-    internals() {
+    internals()
+        : static_property_type(make_static_property_type()),
+          default_metaclass(make_default_metaclass()) {
         PyThreadState *cur_tstate = PyThreadState_Get();
         tstate = cur_tstate;
 
         istate = cur_tstate->interp;
         registered_exception_translators.push_front(&translate_exception);
-        static_property_type = make_static_property_type();
-        default_metaclass = make_default_metaclass();
 #ifdef Py_GIL_DISABLED
         // Scale proportional to the number of cores. 2x is a heuristic to reduce contention.
         auto num_shards
@@ -539,19 +539,20 @@ class internals_pp_manager {
         dict state_dict = get_python_state_dict();
         auto internals_obj
             = reinterpret_steal<object>(dict_getitemstringref(state_dict.ptr(), holder_id_));
+        std::unique_ptr<InternalsType> *pp;
         if (internals_obj) {
             void *raw_ptr = PyCapsule_GetPointer(internals_obj.ptr(), /*name=*/nullptr);
             if (!raw_ptr) {
                 raise_from(PyExc_SystemError,
                            "pybind11::detail::internals_pp_manager::get_pp_from_dict() FAILED");
                 throw error_already_set();
             }
-            return reinterpret_cast<std::unique_ptr<InternalsType> *>(raw_ptr);
+            pp = reinterpret_cast<std::unique_ptr<InternalsType> *>(raw_ptr);
         } else {
-            auto pp = new std::unique_ptr<InternalsType>;
+            pp = new std::unique_ptr<InternalsType>;
             state_dict[holder_id_] = capsule(reinterpret_cast<void *>(pp));
-            return pp;
         }
+        return pp;
     }
 
     char const *holder_id_ = nullptr;

include/pybind11/detail/type_caster_base.h

@@ -49,7 +49,7 @@ class loader_life_support {
     /// A new patient frame is created when a function is entered
     loader_life_support() {
         auto &stack_top = get_internals().loader_life_support_tls;
-        parent = stack_top;
+        parent = stack_top.get();
         stack_top = this;
     }
 
@@ -68,7 +68,7 @@ class loader_life_support {
     /// This can only be used inside a pybind11-bound function, either by `argument_loader`
     /// at argument preparation time or by `py::cast()` at execution time.
     PYBIND11_NOINLINE static void add_patient(handle h) {
-        loader_life_support *frame = get_internals().loader_life_support_tls;
+        loader_life_support *frame = get_internals().loader_life_support_tls.get();
         if (!frame) {
             // NOTE: It would be nice to include the stack frames here, as this indicates
             // use of pybind11::cast<> outside the normal call framework, finding such