Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 06:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split out non-functional changes from https://github.com/pybind/pybind11/pull/5332 (#5333)

Browse Source 
PREPARATION for:

PR #5332 — Fix handling of const unique_ptr<T, D> & (do not disown).

Splitting out so that the functional changes under PR #5332 will be more obvious.
This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-08-25 22:41:16 +07:00 committed by GitHub
parent d58cd0dddb
commit bf54ecdf9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/pybind11/cast.h
View File

@ -871,14 +871,14 @@ public:
pybind11_fail("Passing `std::shared_ptr<T> *` from Python to C++ is not supported " pybind11_fail("Passing `std::shared_ptr<T> *` from Python to C++ is not supported "
"(inherently unsafe)."); "(inherently unsafe).");
} }
return std::addressof(shared_ptr_holder); return std::addressof(shared_ptr_storage);
} }
explicit operator std::shared_ptr<type> &() { explicit operator std::shared_ptr<type> &() {
if (typeinfo->holder_enum_v == detail::holder_enum_t::smart_holder) { if (typeinfo->holder_enum_v == detail::holder_enum_t::smart_holder) {
shared_ptr_holder = sh_load_helper.load_as_shared_ptr(value); shared_ptr_storage = sh_load_helper.load_as_shared_ptr(value);
} }
return shared_ptr_holder; return shared_ptr_storage;
} }
static handle static handle
@ -924,7 +924,7 @@ protected:
} }
if (v_h.holder_constructed()) { if (v_h.holder_constructed()) {
value = v_h.value_ptr(); value = v_h.value_ptr();
shared_ptr_holder = v_h.template holder<std::shared_ptr<type>>(); shared_ptr_storage = v_h.template holder<std::shared_ptr<type>>();
return; return;
} }
throw cast_error("Unable to cast from non-held to held instance (T& to Holder<T>) " throw cast_error("Unable to cast from non-held to held instance (T& to Holder<T>) "
@ -953,8 +953,8 @@ protected:
if (typeinfo->holder_enum_v == detail::holder_enum_t::smart_holder) { if (typeinfo->holder_enum_v == detail::holder_enum_t::smart_holder) {
sh_load_helper.loaded_v_h = sub_caster.sh_load_helper.loaded_v_h; sh_load_helper.loaded_v_h = sub_caster.sh_load_helper.loaded_v_h;
} else { } else {
shared_ptr_holder shared_ptr_storage
= std::shared_ptr<type>(sub_caster.shared_ptr_holder, (type *) value); = std::shared_ptr<type>(sub_caster.shared_ptr_storage, (type *) value);
} }
return true; return true;
} }
@ -964,8 +964,8 @@ protected:
static bool try_direct_conversions(handle) { return false; } static bool try_direct_conversions(handle) { return false; }
std::shared_ptr<type> shared_ptr_holder;
smart_holder_type_caster_support::load_helper<remove_cv_t<type>> sh_load_helper; // Const2Mutbl smart_holder_type_caster_support::load_helper<remove_cv_t<type>> sh_load_helper; // Const2Mutbl
std::shared_ptr<type> shared_ptr_storage;
}; };
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT #endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
@ -1040,7 +1040,7 @@ public:
policy = return_value_policy::reference_internal; policy = return_value_policy::reference_internal;
} }
if (policy != return_value_policy::reference_internal) { if (policy != return_value_policy::reference_internal) {
throw cast_error("Invalid return_value_policy for unique_ptr&"); throw cast_error("Invalid return_value_policy for const unique_ptr&");
} }
return type_caster_base<type>::cast(src.get(), policy, parent); return type_caster_base<type>::cast(src.get(), policy, parent);
} }

6
tests/test_class_sh_trampoline_shared_from_this.cpp
View File

@ -87,7 +87,9 @@ long pass_shared_ptr(const std::shared_ptr<Sft> &obj) {
return sft.use_count(); return sft.use_count();
} }
void pass_unique_ptr(const std::unique_ptr<Sft> &) {} void pass_unique_ptr_cref(const std::unique_ptr<Sft> &) {
throw std::runtime_error("Expected to not be reached.");
}
Sft *make_pure_cpp_sft_raw_ptr(const std::string &history_seed) { return new Sft{history_seed}; } Sft *make_pure_cpp_sft_raw_ptr(const std::string &history_seed) { return new Sft{history_seed}; }
@ -135,7 +137,7 @@ TEST_SUBMODULE(class_sh_trampoline_shared_from_this, m) {
m.def("use_count", use_count); m.def("use_count", use_count);
m.def("pass_shared_ptr", pass_shared_ptr); m.def("pass_shared_ptr", pass_shared_ptr);
m.def("pass_unique_ptr", pass_unique_ptr); m.def("pass_unique_ptr_cref", pass_unique_ptr_cref);
m.def("make_pure_cpp_sft_raw_ptr", make_pure_cpp_sft_raw_ptr); m.def("make_pure_cpp_sft_raw_ptr", make_pure_cpp_sft_raw_ptr);
m.def("make_pure_cpp_sft_unq_ptr", make_pure_cpp_sft_unq_ptr); m.def("make_pure_cpp_sft_unq_ptr", make_pure_cpp_sft_unq_ptr);
m.def("make_pure_cpp_sft_shd_ptr", make_pure_cpp_sft_shd_ptr); m.def("make_pure_cpp_sft_shd_ptr", make_pure_cpp_sft_shd_ptr);

3
tests/test_class_sh_trampoline_shared_from_this.py
View File

@ -138,10 +138,11 @@ def test_pass_released_shared_ptr_as_unique_ptr():
stash1 = m.SftSharedPtrStash(1) stash1 = m.SftSharedPtrStash(1)
stash1.Add(obj) # Releases shared_ptr to C++. stash1.Add(obj) # Releases shared_ptr to C++.
with pytest.raises(ValueError) as exc_info: with pytest.raises(ValueError) as exc_info:
m.pass_unique_ptr(obj) m.pass_unique_ptr_cref(obj)
assert str(exc_info.value) == ( assert str(exc_info.value) == (
"Python instance is currently owned by a std::shared_ptr." "Python instance is currently owned by a std::shared_ptr."
) )
assert obj.history == "PySft_Stash1Add"
@pytest.mark.parametrize( @pytest.mark.parametrize(