CI fixes

Author: oremanj

include/pybind11/detail/type_caster_base.h

@@ -1708,7 +1708,7 @@ class type_caster_base : public type_caster_generic {
             srcs, return_value_policy::take_ownership, {}, nullptr, nullptr, holder);
         if (srcs.used_foreign) {
             // Foreign cast succeeded; release C++ ownership
-            (void) holder->release();
+            (void) holder->release(); // NOLINT(bugprone-unused-return-value)
         }
         return ret;
     }
@@ -1724,7 +1724,7 @@ class type_caster_base : public type_caster_generic {
             ret.dec_ref();
             throw error_already_set();
         }
-        (void) sp.release();
+        (void) sp.release(); // NOLINT(bugprone-unused-return-value)
     }
 
     template <class T>

include/pybind11/pybind11.h

@@ -158,10 +158,11 @@ inline std::string generate_function_signature(const char *type_caster_name_fiel
             if (!t) {
                 pybind11_fail("Internal error while parsing type signature (1)");
             }
-            if (handle th = detail::get_type_handle(*t, false, true)) {
-                signature += th.attr("__module__").cast<std::string>() + "."
-                             + th.attr("__qualname__").cast<std::string>();
-            } else if ((th = detail::global_internals_native_enum_type_map_get_item(*t))) {
+            handle th = detail::get_type_handle(*t, false, true);
+            if (!th) {
+                th = detail::global_internals_native_enum_type_map_get_item(*t);
+            }
+            if (th) {
                 signature += th.attr("__module__").cast<std::string>() + "."
                              + th.attr("__qualname__").cast<std::string>();
             } else if (func_rec->is_new_style_constructor && arg_index == 0) {

tests/test_potentially_slicing_weak_ptr.cpp

@@ -11,6 +11,7 @@ namespace potentially_slicing_weak_ptr {
 
 template <int> // Using int as a trick to easily generate multiple types.
 struct VirtBase {
+    VirtBase() = default;
     virtual ~VirtBase() = default;
     VirtBase(const VirtBase &) = delete;
     virtual int get_code() { return 100; }