mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
* Pure `git merge --squash smart_holder` (no manual interventions). * Remove ubench/ directory. * Remove include/pybind11/smart_holder.h * [ci skip] smart_ptrs.rst updates [WIP/unfinished] * [ci skip] smart_ptrs.rst updates continued; also updating classes.rst, advanced/classes.rst * Remove README_smart_holder.rst * Restore original README.rst from master * [ci skip] Minimal change to README.rst, to leave a hint that this is pybind11v3 * [ci skip] Work in ChatGPT suggestions. * Change macro name to PYBIND11_RUN_TESTING_WITH_SMART_HOLDER_AS_DEFAULT_BUT_NEVER_USE_IN_PRODUCTION_PLEASE * Add a note pointing to the holder reinterpret_cast. * Incorporate suggestion by @virtuald: https://github.com/pybind/pybind11/pull/5542#discussion_r1967000989 * Systematically change most py::class_ to py::classh under docs/ * Remove references to README_smart_holder.rst This should have been part of commiteb550d03d3. * [ci skip] Fix minor oversight (``class_`` -> ``py::class_``) noticed by chance. * [ci skip] Resolve suggestion by @virtuald https://github.com/pybind/pybind11/pull/5542#discussion_r1969940605 * [ci skip] Apply suggestions by @timohl (thanks!) * https://github.com/pybind/pybind11/pull/5542#discussion_r1970714551 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971315329 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971322821 * Replace `classh : class_` inhertance with `using`, as suggested by @henryiii https://github.com/pybind/pybind11/pull/5542#issuecomment-2689034104 * Revert "Systematically change most py::class_ to py::classh under docs/" This reverts commitac9d31e13f. * docs: focus on py::smart_holder instead of py::classh Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * Restore minor general fixes that got lost whenac9d31e13fwas reverted. * Remove `- smart_holder` from list of branches in all .github/workflows * Extend classh note to explain whitespace noise motivation. * Suggest `py::smart_holder` for "most situations for safety" * Add back PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT This define was * introduced with https://github.com/pybind/pybind11/pull/5286 * removed with https://github.com/pybind/pybind11/pull/5531 It is has been in use here: *f02a2b7653/pybind11_protobuf/native_proto_caster.h (L89-L101)Currently pybind11 unit tests for the two holder caster backwards compatibility traits * `copyable_holder_caster_shared_ptr_with_smart_holder_support_enabled` * `move_only_holder_caster_unique_ptr_with_smart_holder_support_enabled` are missing. * Add py::trampoline_self_life_support to all trampoline examples under docs/. Address suggestion by @timohl: * https://github.com/pybind/pybind11/pull/5542#issuecomment-2686452062 Add to the "please think twice" note: the overhead for safety is likely in the noise. Also fix a two-fold inconsistency introduced by revert-commit1e646c91b4: 1. py::trampoline_self_life_support is mentioned in a note, but is missing in the example right before. 2. The section starting with To enable safely passing a ``std::unique_ptr`` to a trampoline object between is obsolete. * Fix whitespace accident (indentation) introduced with1e646c91b4Apparently the mis-indentation was introduced when resolving merge conflicts for what became1e646c91b4* WHITESPACE CHANGES ONLY in README.rst (list of people that made significant contributions) * Add Ethan Steinberg to list of people that made significant contributions (for completeness, unrelated to smart_holder work). * [ci skip] Add to list of people that made significant contributions: major and/or influential contributors to smart_holder branch * #2904 by @rhaschke was merged on Mar 16, 2021 * #3012 by @rhaschke was merged on May 28, 2021 * #3039 by @jakobandersen was merged on Jun 29, 2021 * #3048 by @Skylion007 was merged on Jun 18, 2021 * #3588 by @virtuald was merged on Jan 3, 2022 * #3633 by @wangxf123456 was merged on Jan 25, 2022 * #3635 by @virtuald was merged on Jan 26, 2022 * #3645 by @wangxf123456 was merged on Jan 25, 2022 * #3796 by @wangxf123456 was merged on Mar 10, 2022 * #3807 by @wangxf123456 was merged on Mar 18, 2022 * #3838 by @wangxf123456 was merged on Apr 15, 2022 * #3929 by @tomba was merged on May 7, 2022 * #4031 by @wangxf123456 was merged on Jun 27, 2022 * #4343 by @wangxf123456 was merged on Nov 18, 2022 * #4381 by @wangxf123456 was merged on Dec 5, 2022 * #4539 by @wangxf123456 was merged on Feb 28, 2023 * #4609 by @wangxf123456 was merged on Apr 6, 2023 * #4775 by @wangxf123456 was merged on Aug 3, 2023 * #4921 by @iwanders was merged on Nov 7, 2023 * #4924 by @iwanders was merged on Nov 6, 2023 * #5401 by @msimacek was merged on Oct 8, 2024 Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com>
94 lines
2.7 KiB
C++
94 lines
2.7 KiB
C++
#include "pybind11_tests.h"
|
|
|
|
#include <cstddef>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
namespace test_class_sh_mi_thunks {
|
|
|
|
// For general background: https://shaharmike.com/cpp/vtable-part2/
|
|
// C++ vtables - Part 2 - Multiple Inheritance
|
|
// ... the compiler creates a 'thunk' method that corrects `this` ...
|
|
|
|
struct Base0 {
|
|
virtual ~Base0() = default;
|
|
Base0() = default;
|
|
Base0(const Base0 &) = delete;
|
|
};
|
|
|
|
struct Base1 {
|
|
virtual ~Base1() = default;
|
|
// Using `vector` here because it is known to make this test very sensitive to bugs.
|
|
std::vector<int> vec = {1, 2, 3, 4, 5};
|
|
Base1() = default;
|
|
Base1(const Base1 &) = delete;
|
|
};
|
|
|
|
struct Derived : Base1, Base0 {
|
|
~Derived() override = default;
|
|
Derived() = default;
|
|
Derived(const Derived &) = delete;
|
|
};
|
|
|
|
} // namespace test_class_sh_mi_thunks
|
|
|
|
TEST_SUBMODULE(class_sh_mi_thunks, m) {
|
|
using namespace test_class_sh_mi_thunks;
|
|
|
|
m.def("ptrdiff_drvd_base0", []() {
|
|
auto drvd = std::unique_ptr<Derived>(new Derived);
|
|
auto *base0 = dynamic_cast<Base0 *>(drvd.get());
|
|
return std::ptrdiff_t(reinterpret_cast<char *>(drvd.get())
|
|
- reinterpret_cast<char *>(base0));
|
|
});
|
|
|
|
py::classh<Base0>(m, "Base0");
|
|
py::classh<Base1>(m, "Base1");
|
|
py::classh<Derived, Base1, Base0>(m, "Derived");
|
|
|
|
m.def(
|
|
"get_drvd_as_base0_raw_ptr",
|
|
[]() {
|
|
auto *drvd = new Derived;
|
|
auto *base0 = dynamic_cast<Base0 *>(drvd);
|
|
return base0;
|
|
},
|
|
py::return_value_policy::take_ownership);
|
|
|
|
m.def("get_drvd_as_base0_shared_ptr", []() {
|
|
auto drvd = std::make_shared<Derived>();
|
|
auto base0 = std::dynamic_pointer_cast<Base0>(drvd);
|
|
return base0;
|
|
});
|
|
|
|
m.def("get_drvd_as_base0_unique_ptr", []() {
|
|
auto drvd = std::unique_ptr<Derived>(new Derived);
|
|
auto base0 = std::unique_ptr<Base0>(std::move(drvd));
|
|
return base0;
|
|
});
|
|
|
|
m.def("vec_size_base0_raw_ptr", [](const Base0 *obj) {
|
|
const auto *obj_der = dynamic_cast<const Derived *>(obj);
|
|
if (obj_der == nullptr) {
|
|
return std::size_t(0);
|
|
}
|
|
return obj_der->vec.size();
|
|
});
|
|
|
|
m.def("vec_size_base0_shared_ptr", [](const std::shared_ptr<Base0> &obj) -> std::size_t {
|
|
const auto obj_der = std::dynamic_pointer_cast<Derived>(obj);
|
|
if (!obj_der) {
|
|
return std::size_t(0);
|
|
}
|
|
return obj_der->vec.size();
|
|
});
|
|
|
|
m.def("vec_size_base0_unique_ptr", [](std::unique_ptr<Base0> obj) -> std::size_t {
|
|
const auto *obj_der = dynamic_cast<const Derived *>(obj.get());
|
|
if (obj_der == nullptr) {
|
|
return std::size_t(0);
|
|
}
|
|
return obj_der->vec.size();
|
|
});
|
|
}
|