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

Call all_type_info_check_for_divergence() also from type_caster_generic::load_impl<>

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2023-11-07 08:45:52 -08:00
parent 9ae6cbaea1
commit 5f5fd6a68e
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/pybind11/detail/type_caster_base.h
View File

@ -785,14 +785,22 @@ public:
// if we can find an exact match (or, for a simple C++ type, an inherited match); if // if we can find an exact match (or, for a simple C++ type, an inherited match); if
// so, we can safely reinterpret_cast to the relevant pointer. // so, we can safely reinterpret_cast to the relevant pointer.
if (bases.size() > 1) { if (bases.size() > 1) {
std::vector<type_info *> matching_bases;
for (auto *base : bases) { for (auto *base : bases) {
if (no_cpp_mi ? PyType_IsSubtype(base->type, typeinfo->type) if (no_cpp_mi ? PyType_IsSubtype(base->type, typeinfo->type)
: base->type == typeinfo->type) { : base->type == typeinfo->type) {
this_.load_value( matching_bases.push_back(base);
reinterpret_cast<instance *>(src.ptr())->get_value_and_holder(base));
return true;
} }
} }
if (matching_bases.size() != 0) {
if (matching_bases.size() > 1) {
matching_bases.push_back(const_cast<type_info *>(typeinfo));
all_type_info_check_for_divergence(matching_bases);
}
this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder(
matching_bases[0]));
return true;
}
} }
// Case 2c: C++ multiple inheritance is involved and we couldn't find an exact type // Case 2c: C++ multiple inheritance is involved and we couldn't find an exact type

2
tests/test_python_multiple_inheritance.cpp
View File

@ -61,4 +61,6 @@ TEST_SUBMODULE(python_multiple_inheritance, m) {
.def("reset_drvd2_value", &CppDrvd2::reset_drvd2_value) .def("reset_drvd2_value", &CppDrvd2::reset_drvd2_value)
.def("get_base_value_from_drvd2", &CppDrvd2::get_base_value_from_drvd2) .def("get_base_value_from_drvd2", &CppDrvd2::get_base_value_from_drvd2)
.def("reset_base_value_from_drvd2", &CppDrvd2::reset_base_value_from_drvd2); .def("reset_base_value_from_drvd2", &CppDrvd2::reset_base_value_from_drvd2);
m.def("pass_CppBase", [](const CppBase *) {});
} }

12
tests/test_python_multiple_inheritance.py
View File

@ -30,6 +30,12 @@ class PCD(PC1, PC2):
pass pass
class PCDI(PC1, PC2):
def __init__(self):
PC1.__init__(self, 11)
PC2.__init__(self, 12)
def test_PC(): def test_PC():
d = PC(11) d = PC(11)
assert d.get_base_value() == 11 assert d.get_base_value() == 11
@ -69,3 +75,9 @@ def test_PCD():
match=r"CppDrvd2\.__init__\(\) must be called when overriding __init__$", match=r"CppDrvd2\.__init__\(\) must be called when overriding __init__$",
): ):
PCD(11) PCD(11)
def test_PCDI():
obj = PCDI()
with pytest.raises(TypeError, match="^bases include diverging derived types: "):
m.pass_CppBase(obj)