Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fully qualify usages of concat to protect against ADL #4955

Merged
merged 4 commits into from
Mar 27, 2024
Merged

fix: fully qualify usages of concat to protect against ADL #4955

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f4a99
Call concat with proper namespace in cast.h
volkm Nov 29, 2023
5a489d5
Apply suggestions from code review
henryiii Mar 21, 2024
bade99c
tests: add test for ADL on concat
henryiii Mar 27, 2024
64157f2
fix: fully qualify all usages of concat
henryiii Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions include/pybind11/cast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,9 @@ class tuple_caster {
return cast(*src, policy, parent);
}

static constexpr auto name
= const_name("tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
static constexpr auto name = const_name("tuple[")
+ ::pybind11::detail::concat(make_caster<Ts>::name...)
+ const_name("]");

template <typename T>
using cast_op_type = type;
Expand Down Expand Up @@ -1464,7 +1465,8 @@ class argument_loader {
static_assert(args_pos == -1 || args_pos == constexpr_first<argument_is_args, Args...>(),
"py::args cannot be specified more than once");

static constexpr auto arg_names = concat(type_descr(make_caster<Args>::name)...);
static constexpr auto arg_names
= ::pybind11::detail::concat(type_descr(make_caster<Args>::name)...);

bool load_args(function_call &call) { return load_impl_sequence(call, indices{}); }

Expand Down
12 changes: 12 additions & 0 deletions tests/test_custom_type_casters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ struct type_caster<other_lib::MyType> : public other_lib::my_caster {};
} // namespace detail
} // namespace PYBIND11_NAMESPACE

// This simply is required to compile
henryiii marked this conversation as resolved.
Show resolved Hide resolved
namespace ADL_issue {
template <typename OutStringType = std::string, typename... Args>
OutStringType concat(Args &&...) {
return OutStringType();
}

struct test {};
} // namespace ADL_issue

TEST_SUBMODULE(custom_type_casters, m) {
// test_custom_type_casters

Expand Down Expand Up @@ -206,4 +216,6 @@ TEST_SUBMODULE(custom_type_casters, m) {
py::return_value_policy::reference);

m.def("other_lib_type", [](other_lib::MyType x) { return x; });

m.def("_adl_issue", [](const ADL_issue::test &) {});
}