Small reduction in code complexity.

rwgk · rwgk · commit 93169cc907c7 · 2021-06-30T07:04:31.000-07:00
diff --git a/include/pybind11/detail/smart_holder_type_casters.h b/include/pybind11/detail/smart_holder_type_casters.h
@@ -422,11 +422,9 @@ struct smart_holder_type_caster_load {
                     pybind11_fail("smart_holder_type_casters loaded_as_shared_ptr failure: "
                                   "load_impl.loaded_v_h.inst == sptsls_ptr->self");
                 }
-                return std::shared_ptr<T>(
-                    type_raw_ptr,
-                    shared_ptr_trampoline_self_life_support(load_impl.loaded_v_h.inst));
             }
-            if (!pybindit::memory::type_has_shared_from_this(type_raw_ptr)) {
+            if (sptsls_ptr != nullptr
+                || !pybindit::memory::type_has_shared_from_this(type_raw_ptr)) {
                 return std::shared_ptr<T>(
                     type_raw_ptr,
                     shared_ptr_trampoline_self_life_support(load_impl.loaded_v_h.inst));

Original file line number	Diff line number	Diff line change
`@@ -422,11 +422,9 @@ struct smart_holder_type_caster_load {`
`422`	`422`	`pybind11_fail("smart_holder_type_casters loaded_as_shared_ptr failure: "`
`423`	`423`	`"load_impl.loaded_v_h.inst == sptsls_ptr->self");`
`424`	`424`	`}`
`425`		`- return std::shared_ptr<T>(`
`426`		`- type_raw_ptr,`
`427`		`- shared_ptr_trampoline_self_life_support(load_impl.loaded_v_h.inst));`
`428`	`425`	`}`
`429`		`- if (!pybindit::memory::type_has_shared_from_this(type_raw_ptr)) {`
	`426`	`+ if (sptsls_ptr != nullptr`
	`427`	`+ \|\| !pybindit::memory::type_has_shared_from_this(type_raw_ptr)) {`
`430`	`428`	`return std::shared_ptr<T>(`
`431`	`429`	`type_raw_ptr,`
`432`	`430`	`shared_ptr_trampoline_self_life_support(load_impl.loaded_v_h.inst));`