Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-12 11:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factoring out convert_type and folding into loaded_as_unique_ptr.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-01-23 13:35:13 -08:00
parent db9af62ad8
commit e7325dfc26
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/pybind11/detail/classh_type_casters.h
View File

@ -231,29 +231,42 @@ struct smart_holder_type_caster_load {
return true; return true;
} }
T *loaded_as_raw_ptr_unowned() { T *convert_type(void *void_ptr) {
void *void_ptr = loaded_smhldr_ptr->as_raw_ptr_unowned<void>(); if (void_ptr != nullptr && load_impl.loaded_v_h_cpptype != nullptr
if (load_impl.loaded_v_h_cpptype == nullptr || load_impl.reinterpret_cast_deemed_ok && !load_impl.reinterpret_cast_deemed_ok && load_impl.implicit_cast != nullptr) {
|| load_impl.implicit_cast == nullptr) { void_ptr = load_impl.implicit_cast(void_ptr);
}
return static_cast<T *>(void_ptr); return static_cast<T *>(void_ptr);
} }
void *implicit_casted = load_impl.implicit_cast(void_ptr);
return static_cast<T *>(implicit_casted); T *loaded_as_raw_ptr_unowned() {
return convert_type(loaded_smhldr_ptr->as_raw_ptr_unowned<void>());
} }
std::shared_ptr<T> loaded_as_shared_ptr() { std::shared_ptr<T> loaded_as_shared_ptr() {
T *raw_ptr = loaded_as_raw_ptr_unowned(); std::shared_ptr<void> void_ptr = loaded_smhldr_ptr->as_shared_ptr<void>();
return std::shared_ptr<T>(loaded_smhldr_ptr->as_shared_ptr<void>(), raw_ptr); return std::shared_ptr<T>(void_ptr, convert_type(void_ptr.get()));
} }
std::unique_ptr<T> loaded_as_unique_ptr() { std::unique_ptr<T> loaded_as_unique_ptr() {
void *value_void_ptr = load_impl.loaded_v_h.value_ptr(); loaded_smhldr_ptr->ensure_can_release_ownership();
auto unq_ptr = loaded_smhldr_ptr->as_unique_ptr<T>(); auto raw_void_ptr = loaded_smhldr_ptr->as_raw_ptr_unowned<void>();
// MISSING: Safety checks for type conversions
// (T must be polymorphic or meet certain other conditions).
T *raw_type_ptr = convert_type(raw_void_ptr);
// Critical transfer-of-ownership section. This must stay together.
loaded_smhldr_ptr->release_ownership();
auto result = std::unique_ptr<T>(raw_type_ptr);
void *value_void_ptr
= load_impl.loaded_v_h.value_ptr(); // Expected to be identical to raw_void_ptr.
load_impl.loaded_v_h.holder<holder_type>().~holder_type(); load_impl.loaded_v_h.holder<holder_type>().~holder_type();
load_impl.loaded_v_h.set_holder_constructed(false); load_impl.loaded_v_h.set_holder_constructed(false);
load_impl.loaded_v_h.value_ptr() = nullptr; load_impl.loaded_v_h.value_ptr() = nullptr;
deregister_instance(load_impl.loaded_v_h.inst, value_void_ptr, load_impl.loaded_v_h.type); deregister_instance(load_impl.loaded_v_h.inst, value_void_ptr, load_impl.loaded_v_h.type);
return unq_ptr;
return result;
} }
protected: protected:

15
include/pybind11/smart_holder_poc.h
View File

@ -186,13 +186,22 @@ struct smart_holder {
return hld; return hld;
} }
template <typename T> void ensure_can_release_ownership(const char *context = "ensure_can_release_ownership") {
T *as_raw_ptr_release_ownership(const char *context = "as_raw_ptr_release_ownership") {
ensure_vptr_is_using_builtin_delete(context); ensure_vptr_is_using_builtin_delete(context);
ensure_use_count_1(context); ensure_use_count_1(context);
T *raw_ptr = as_raw_ptr_unowned<T>(); }
// Caller is responsible for calling ensure_can_release_ownership().
void release_ownership() {
*vptr_deleter_armed_flag_ptr = false; *vptr_deleter_armed_flag_ptr = false;
vptr.reset(); vptr.reset();
}
template <typename T>
T *as_raw_ptr_release_ownership(const char *context = "as_raw_ptr_release_ownership") {
ensure_can_release_ownership(context);
T *raw_ptr = as_raw_ptr_unowned<T>();
release_ownership();
return raw_ptr; return raw_ptr;
} }