Skip to content

Commit f27bd9a

Browse files
committed
Alternative approach to pybind#3807 that supports an important PyCLIF use case: Base not specified in classh<Derived> statement, but passing Derived as Base works anyway.
1 parent fb78376 commit f27bd9a

File tree

3 files changed

+38
-15
lines changed

3 files changed

+38
-15
lines changed

Diff for: include/pybind11/detail/smart_holder_type_casters.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ inline void *try_as_void_ptr_capsule_get_pointer(handle src, const char *typeid_
6060

6161
std::string as_void_ptr_function_name("as_");
6262
as_void_ptr_function_name += type_name;
63-
if (hasattr(src, as_void_ptr_function_name.c_str())) {
63+
if (hasattr(src, as_void_ptr_function_name.c_str()) && !hasattr(src, "__getattr__")) {
6464
auto as_void_ptr_function = function(src.attr(as_void_ptr_function_name.c_str()));
6565
auto void_ptr_capsule = as_void_ptr_function();
6666
if (isinstance<capsule>(void_ptr_capsule)) {
@@ -304,11 +304,8 @@ class modified_type_caster_generic_load_impl {
304304
loaded_v_h = value_and_holder();
305305
return true;
306306
}
307-
if (convert && cpptype) {
308-
const auto &bases = all_type_info(srctype);
309-
if (bases.empty() && try_as_void_ptr_capsule(src)) {
310-
return true;
311-
}
307+
if (convert && cpptype && try_as_void_ptr_capsule(src)) {
308+
return true;
312309
}
313310
return false;
314311
}

Diff for: tests/test_class_sh_void_ptr_capsule.cpp

+31-9
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,33 @@ struct Derived2 : Base12 {
5858
int bar() const { return 2; }
5959
};
6060

61+
struct UnspecBase {
62+
virtual ~UnspecBase() = default;
63+
virtual int Get() const { return 100; }
64+
};
65+
66+
inline int PassUnspecBase(const UnspecBase &sb) { return sb.Get() + 30; }
67+
68+
struct UnspecDerived : UnspecBase {
69+
int Get() const override { return 200; }
70+
};
71+
6172
} // namespace class_sh_void_ptr_capsule
6273
} // namespace pybind11_tests
6374

64-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Valid)
65-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::TypeWithGetattr)
66-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Base1)
67-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Base2)
68-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Base12)
69-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Derived1)
70-
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Derived2)
75+
using namespace pybind11_tests::class_sh_void_ptr_capsule;
7176

72-
TEST_SUBMODULE(class_sh_void_ptr_capsule, m) {
73-
using namespace pybind11_tests::class_sh_void_ptr_capsule;
77+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Valid)
78+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(TypeWithGetattr)
79+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base1)
80+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base2)
81+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base12)
82+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Derived1)
83+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Derived2)
84+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(UnspecBase)
85+
PYBIND11_SMART_HOLDER_TYPE_CASTERS(UnspecDerived)
7486

87+
TEST_SUBMODULE(class_sh_void_ptr_capsule, m) {
7588
py::classh<Valid>(m, "Valid");
7689

7790
m.def("get_from_valid_capsule", &get_from_valid_capsule);
@@ -102,4 +115,13 @@ TEST_SUBMODULE(class_sh_void_ptr_capsule, m) {
102115
py::classh<Derived1, Base12>(m, "Derived1").def(py::init<>()).def("bar", &Derived1::bar);
103116

104117
py::classh<Derived2, Base12>(m, "Derived2").def(py::init<>()).def("bar", &Derived2::bar);
118+
119+
py::classh<UnspecBase>(m, "UnspecBase");
120+
m.def("PassUnspecBase", PassUnspecBase);
121+
py::classh<UnspecDerived>(m, "UnspecDerived") // UnspecBase NOT specified as base here.
122+
.def(py::init<>())
123+
.def("as_pybind11_tests_class_sh_void_ptr_capsule_UnspecBase", [](UnspecDerived *self) {
124+
return py::reinterpret_steal<py::object>(
125+
PyCapsule_New(static_cast<void *>(self), nullptr, nullptr));
126+
});
105127
}

Diff for: tests/test_class_sh_void_ptr_capsule.py

+4
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,7 @@ def test_multiple_inheritance_getattr():
9494
assert d2.foo() == 0
9595
assert d2.bar() == 2
9696
assert d2.prop2 == "Base GetAttr: prop2"
97+
98+
99+
def test_pass_unspecified_base():
100+
assert m.PassUnspecBase(m.UnspecDerived()) == 230

0 commit comments

Comments
 (0)