Skip to content

Remove EnclosingType from operator_thunk as it is not used #347

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

Merged
jbcoe merged 1 commit into from
Sep 13, 2026
Merged

Remove EnclosingType from operator_thunk as it is not used #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions protocol.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,19 +402,17 @@ struct member_thunk
// derives from this thunk directly instead of holding it as a data member,
// letting `ProtocolType` be recovered with a plain static_cast.
template <std::meta::operators Operator, typename FnPtrType,
typename EnclosingType, typename ProtocolType, typename Vtable,
std::meta::info Member, bool IsConst, bool IsNoexcept>
typename ProtocolType, typename Vtable, std::meta::info Member,
bool IsConst, bool IsNoexcept>
struct operator_thunk;

// TODO(jbcoe): Extend this approach to handle lvalue and rvalue qualifiers;
// until then `protocol_interface_function_infos` rejects ref-qualified
// interface members.
template <typename R, typename... Args, typename EnclosingType,
typename ProtocolType, typename Vtable, std::meta::info Member,
bool IsConst, bool IsNoexcept>
template <typename R, typename... Args, typename ProtocolType, typename Vtable,
std::meta::info Member, bool IsConst, bool IsNoexcept>
struct operator_thunk<std::meta::operators::op_parentheses, R (*)(Args...),
EnclosingType, ProtocolType, Vtable, Member, IsConst,
IsNoexcept> {
ProtocolType, Vtable, Member, IsConst, IsNoexcept> {
static constexpr std::meta::info vtable_entry =
find_vtable_entry<^^Vtable, Member>();

Expand Down Expand Up @@ -448,14 +446,13 @@ struct operator_thunk<std::meta::operators::op_parentheses, R (*)(Args...),
};

// The `operator_thunk` specialisation for an `overload_spec`.
template <typename Spec, typename EnclosingType, typename ProtocolType,
typename Vtable>
template <typename Spec, typename ProtocolType, typename Vtable>
struct operator_thunk_for;

template <std::meta::info Member, bool IsConst, typename EnclosingType,
typename ProtocolType, typename Vtable>
struct operator_thunk_for<overload_spec<Member, IsConst>, EnclosingType,
ProtocolType, Vtable> {
template <std::meta::info Member, bool IsConst, typename ProtocolType,
typename Vtable>
struct operator_thunk_for<overload_spec<Member, IsConst>, ProtocolType,
Vtable> {
// Build the function-pointer type R(*)(Args...) from the method's return
// type and parameter types.
static consteval std::meta::info fn_ptr_type() {
Expand All @@ -472,33 +469,26 @@ struct operator_thunk_for<overload_spec<Member, IsConst>, EnclosingType,
{
std::meta::reflect_constant(operator_of(Member)),
fn_ptr_type(),
^^EnclosingType, ^^ProtocolType, ^^Vtable,
^^ProtocolType, ^^Vtable,
std::meta::reflect_constant(Member),
std::meta::reflect_constant(IsConst),
std::meta::reflect_constant(is_noexcept(Member))
}):];
// clang-format on
};

template <typename OverloadSpec, typename EnclosingType, typename ProtocolType,
typename Vtable>
template <typename OverloadSpec, typename ProtocolType, typename Vtable>
using operator_thunk_t =
operator_thunk_for<OverloadSpec, EnclosingType, ProtocolType, Vtable>::type;
operator_thunk_for<OverloadSpec, ProtocolType, Vtable>::type;

// The overload set for a synthesised operator X inheriting from an
// `operator_thunk` for each overload.
// `std::meta::operators` is not specified as it can be derived from
// OverloadSpec.
template <typename ProtocolType, typename Vtable, typename... OverloadSpecs>
struct operator_overload_set
: operator_thunk_t<
OverloadSpecs,
operator_overload_set<ProtocolType, Vtable, OverloadSpecs...>,
ProtocolType, Vtable>... {
using operator_thunk_t<
OverloadSpecs,
operator_overload_set<ProtocolType, Vtable, OverloadSpecs...>,
ProtocolType, Vtable>::operator()...;
: operator_thunk_t<OverloadSpecs, ProtocolType, Vtable>... {
using operator_thunk_t<OverloadSpecs, ProtocolType, Vtable>::operator()...;
};

// How generated wrappers treat the const-qualification of interface members.
Expand Down Expand Up @@ -959,8 +949,8 @@ class protocol
friend struct detail::method_thunk;

template <std::meta::operators Operator, typename FnPtrType,
typename EnclosingType, typename ProtocolType, typename Vtable,
std::meta::info Member, bool IsConst, bool IsNoexcept>
typename ProtocolType, typename Vtable, std::meta::info Member,
bool IsConst, bool IsNoexcept>
friend struct detail::operator_thunk;

// Grants `protocol_view` access so that a view of a protocol can share its
Expand Down Expand Up @@ -1275,8 +1265,8 @@ class protocol_view
friend struct detail::method_thunk;

template <std::meta::operators Operator, typename FnPtrType,
typename EnclosingType, typename ProtocolType, typename Vtable,
std::meta::info Member, bool IsConst, bool IsNoexcept>
typename ProtocolType, typename Vtable, std::meta::info Member,
bool IsConst, bool IsNoexcept>
friend struct detail::operator_thunk;

template <typename U>
Expand Down Expand Up @@ -1371,8 +1361,8 @@ class protocol_view<const T>
friend struct detail::method_thunk;

template <std::meta::operators Operator, typename FnPtrType,
typename EnclosingType, typename ProtocolType, typename Vtable,
std::meta::info Member, bool IsConst, bool IsNoexcept>
typename ProtocolType, typename Vtable, std::meta::info Member,
bool IsConst, bool IsNoexcept>
friend struct detail::operator_thunk;

template <typename U>
Expand Down
Loading