Skip to content

rework the STDEXEC_EXPLICIT_THIS_[BEGIN|END] portability macros for better reusability #1895

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
ericniebler merged 2 commits into from
Feb 24, 2026
Merged

rework the STDEXEC_EXPLICIT_THIS_[BEGIN|END] portability macros for better reusability #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e48247
rework the `STDEXEC_EXPLICIT_THIS_[BEGIN|END]` portability macros for…
ericniebler Feb 24, 2026
45a4d69
fix the CUDA build
ericniebler Feb 24, 2026
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
15 changes: 9 additions & 6 deletions include/nvexec/stream/let_xxx.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ namespace nv::execution::_strm
using __decay_ref_t = STDEXEC::__decay_t<Tp>&;

template <class Fun>
using _mk_result_sender_t =
__mtransform<__q<__decay_ref_t>, __mbind_front_q<__call_result_t, Fun>>;
struct _mk_result_sender
{
template <class... Args>
using __f = __remove_rvalue_reference_t<__call_result_t<Fun, __decay_ref_t<Args>...>>;
};

template <class Sender, class PropagateReceiver, class Fun, class SetTag>
requires sender_in<Sender, env_of_t<PropagateReceiver>>
Expand All @@ -57,7 +60,7 @@ namespace nv::execution::_strm
struct _result_sender_size
{
template <class... Args>
using __f = __msize_t<sizeof(__minvoke<_mk_result_sender_t<Fun>, Args...>)>;
using __f = __msize_t<sizeof(__minvoke<_mk_result_sender<Fun>, Args...>)>;
};

static constexpr std::size_t value = __gather_completions_of_t<SetTag,
Expand All @@ -69,7 +72,7 @@ namespace nv::execution::_strm

template <class Receiver, class Fun>
using opstate_for_t = __mcompose<__mbind_back_q<connect_result_t, propagate_receiver<Receiver>>,
_mk_result_sender_t<Fun>>;
_mk_result_sender<Fun>>;

template <class Set, class Sig>
struct __tfx_signal_fn
Expand All @@ -83,7 +86,7 @@ namespace nv::execution::_strm
{
template <class Fun, class... StreamEnv>
using __f = transform_completion_signatures<
__completion_signatures_of_t<__minvoke<_mk_result_sender_t<Fun>, Args...>, StreamEnv...>,
__completion_signatures_of_t<__minvoke<_mk_result_sender<Fun>, Args...>, StreamEnv...>,
completion_signatures<set_error_t(cudaError_t)>>;
};

Expand All @@ -105,7 +108,7 @@ namespace nv::execution::_strm
template <__same_as<Set> Tag, class... Args>
void _complete(Tag, Args&&... args) noexcept
{
using result_sender_t = __minvoke<_mk_result_sender_t<Fun>, Args...>;
using result_sender_t = __minvoke<_mk_result_sender<Fun>, Args...>;
using opstate_t = __minvoke<opstate_for_t<Receiver, Fun>, Args...>;

cudaStream_t stream = opstate_->get_stream();
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__basic_sender.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ namespace STDEXEC
// Non-standard extension:
template <class _Self, receiver _Receiver>
STDEXEC_ATTRIBUTE(nodiscard, always_inline)
static constexpr auto static_connect(_Self&& __self, _Receiver __rcvr) noexcept(
static constexpr auto __static_connect(_Self&& __self, _Receiver __rcvr) noexcept(
__noexcept_of<__sexpr_impl<__tag_t>::__connect, __copy_cvref_t<_Self, __sexpr>, _Receiver>)
-> __result_of<__sexpr_impl<__tag_t>::__connect, __copy_cvref_t<_Self, __sexpr>, _Receiver>
{
Expand Down
58 changes: 29 additions & 29 deletions include/stdexec/__detail/__config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,51 +776,51 @@ namespace STDEXEC

#else

# define STDEXEC_EXPLICIT_THIS_BEGIN(...) \
static STDEXEC_PP_EXPAND(STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_MANGLE_, __VA_ARGS__) \
STDEXEC_PP_RPAREN) STDEXEC_PP_LPAREN STDEXEC_EXPLICIT_THIS_ARGS
# define STDEXEC_EXPLICIT_THIS_CALL_OPERATOR_PROBE_operator() STDEXEC_PP_PROBE(~, 1)

# define STDEXEC_EXPLICIT_THIS_CALL_OPERATOR_PROBE(_NAME) \
STDEXEC_PP_CHECK(STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_CALL_OPERATOR_PROBE_, _NAME))

# define STDEXEC_EXPLICIT_THIS_MANGLE(_NAME) \
STDEXEC_PP_CAT(__static_, \
STDEXEC_PP_IIF(STDEXEC_EXPLICIT_THIS_CALL_OPERATOR_PROBE(_NAME), \
_call, \
_NAME))

# define STDEXEC_EXPLICIT_THIS_EAT_this
# define STDEXEC_EXPLICIT_THIS_MANGLE_auto auto STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
# define STDEXEC_EXPLICIT_THIS_MANGLE_void void STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
# define STDEXEC_EXPLICIT_THIS_MANGLE_bool bool STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN

# define STDEXEC_EXPLICIT_THIS_ARGS(...) \
STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_EAT_, __VA_ARGS__) STDEXEC_PP_RPAREN

# define STDEXEC_EXPLICIT_THIS_END(_FN) \
# define STDEXEC_EXPLICIT_THIS_BEGIN(...) \
static STDEXEC_PP_EXPAND(STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_MANGLE_, __VA_ARGS__) \
STDEXEC_PP_RPAREN) STDEXEC_PP_LPAREN STDEXEC_EXPLICIT_THIS_ARGS

# define STDEXEC_EXPLICIT_THIS_END(_NAME) \
template <class... _Ts> \
STDEXEC_ATTRIBUTE(always_inline) \
auto _FN(_Ts&&... __args) && STDEXEC_AUTO_RETURN \
STDEXEC_ATTRIBUTE(always_inline, host, device) \
auto _NAME(_Ts&&... __args) && STDEXEC_AUTO_RETURN \
( \
decltype(STDEXEC::__get_self<_Ts...>(*this)) \
::STDEXEC_PP_CAT(static_, _FN)(std::move(*this), static_cast<_Ts&&>(__args)...) \
STDEXEC_EXPLICIT_THIS_MANGLE(_NAME)(std::move(*this), static_cast<_Ts&&>(__args)...) \
) \
\
template <class... _Ts> \
STDEXEC_ATTRIBUTE(always_inline) \
auto _FN(_Ts&&... __args) & STDEXEC_AUTO_RETURN \
STDEXEC_ATTRIBUTE(always_inline, host, device) \
auto _NAME(_Ts&&... __args) & STDEXEC_AUTO_RETURN \
( \
decltype(STDEXEC::__get_self<_Ts...>(*this)) \
::STDEXEC_PP_CAT(static_, _FN)(*this, static_cast<_Ts&&>(__args)...) \
STDEXEC_EXPLICIT_THIS_MANGLE(_NAME)(*this, static_cast<_Ts&&>(__args)...) \
) \
\
template <class... _Ts> \
STDEXEC_ATTRIBUTE(always_inline) \
auto _FN(_Ts&&... __args) const & STDEXEC_AUTO_RETURN \
STDEXEC_ATTRIBUTE(always_inline, host, device) \
auto _NAME(_Ts&&... __args) const & STDEXEC_AUTO_RETURN \
( \
decltype(STDEXEC::__get_self<_Ts...>(*this)) \
::STDEXEC_PP_CAT(static_, _FN)(*this, static_cast<_Ts&&>(__args)...) \
STDEXEC_EXPLICIT_THIS_MANGLE(_NAME)(*this, static_cast<_Ts&&>(__args)...) \
)

# define STDEXEC_EXPLICIT_THIS_EAT_this
# define STDEXEC_EXPLICIT_THIS_EAT_auto
# define STDEXEC_EXPLICIT_THIS_EAT_void
# define STDEXEC_EXPLICIT_THIS_MANGLE_auto auto STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
# define STDEXEC_EXPLICIT_THIS_MANGLE_void void STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
# define STDEXEC_EXPLICIT_THIS_MANGLE(_NAME) STDEXEC_PP_CAT(static_, _NAME)

namespace STDEXEC
{
template <class... _Ts, class _Self>
constexpr auto __get_self(_Self const &) -> _Self;
} // namespace STDEXEC

#endif // STDEXEC_NO_STDCPP_EXPLICIT_THIS_PARAMETER()

////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
17 changes: 9 additions & 8 deletions include/stdexec/__detail/__connect.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace STDEXEC
template <class _Sender, class _Receiver>
concept __with_static_member = requires(__declfn_t<_Sender&&> __sndr,
__declfn_t<_Receiver&&> __rcvr) {
STDEXEC_REMOVE_REFERENCE(_Sender)::static_connect(__sndr(), __rcvr());
STDEXEC_REMOVE_REFERENCE(_Sender)::__static_connect(__sndr(), __rcvr());
};

template <class _Sender, class _Receiver>
Expand Down Expand Up @@ -67,8 +67,8 @@ namespace STDEXEC
template <class _Sender, class _Receiver>
requires __with_static_member<_Sender, _Receiver>
extern STDEXEC_CONNECT_DECLFN_FOR(STDEXEC_REMOVE_REFERENCE(_Sender) //
::static_connect(__declval<_Sender>(),
__declval<_Receiver>()))
::__static_connect(__declval<_Sender>(),
__declval<_Receiver>()))
__connect_declfn_v<_Sender, _Receiver, true>;

template <class _Sender, class _Receiver>
Expand Down Expand Up @@ -97,7 +97,7 @@ namespace STDEXEC
template <class _Sender, class _Receiver>
requires __with_static_member<_Sender, _Receiver>
extern __declfn_t<decltype(STDEXEC_REMOVE_REFERENCE(_Sender) //
::static_connect(__declval<_Sender>(), __declval<_Receiver>())),
::__static_connect(__declval<_Sender>(), __declval<_Receiver>())),
false>
__connect_declfn_v<_Sender, _Receiver, false>;

Expand Down Expand Up @@ -149,7 +149,7 @@ namespace STDEXEC
{
return STDEXEC_CONNECT_DECLFN_FOR(
STDEXEC_REMOVE_REFERENCE(_Sender) //
::static_connect(__declval<_Sender>(), __declval<_Receiver>()));
::__static_connect(__declval<_Sender>(), __declval<_Receiver>()));
}
else if constexpr (__with_member<_Sender, _Receiver>)
{
Expand Down Expand Up @@ -180,7 +180,8 @@ namespace STDEXEC
if constexpr (__with_static_member<_Sender, _Receiver>)
{
return __declfn<decltype(STDEXEC_REMOVE_REFERENCE(_Sender) //
::static_connect(__declval<_Sender>(), __declval<_Receiver>())),
::__static_connect(__declval<_Sender>(),
__declval<_Receiver>())),
false>();
}
else if constexpr (__with_member<_Sender, _Receiver>)
Expand Down Expand Up @@ -237,8 +238,8 @@ namespace STDEXEC
if constexpr (__connect::__with_static_member<__new_sndr_t, _Receiver>)
{
return STDEXEC_REMOVE_REFERENCE(
__new_sndr_t)::static_connect(static_cast<__new_sndr_t&&>(__new_sndr),
static_cast<_Receiver&&>(__rcvr));
__new_sndr_t)::__static_connect(static_cast<__new_sndr_t&&>(__new_sndr),
static_cast<_Receiver&&>(__rcvr));
}
else if constexpr (__connect::__with_member<__new_sndr_t, _Receiver>)
{
Expand Down
4 changes: 2 additions & 2 deletions include/stdexec/__detail/__get_completion_signatures.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ namespace STDEXEC
template <class _Sender, class... _Env>
using __legacy_static_member_result_t = //
decltype(STDEXEC_REMOVE_REFERENCE(_Sender) //
::static_get_completion_signatures(__declval<_Sender>(), __declval<_Env>()...));
::__static_get_completion_signatures(__declval<_Sender>(), __declval<_Env>()...));

template <class _Sender>
using __legacy_member_alias_t = STDEXEC_REMOVE_REFERENCE(_Sender)::completion_signatures;
Expand All @@ -125,7 +125,7 @@ namespace STDEXEC
concept __with_legacy_static_member = requires(__declfn_t<_Sender &&> __sndr,
__declfn_t<_Env &&>... __env) {
STDEXEC_REMOVE_REFERENCE(_Sender)
::static_get_completion_signatures(__sndr(), __env()...);
::__static_get_completion_signatures(__sndr(), __env()...);
};

// [WAR]: see nvbugs#5813160
Expand Down
6 changes: 4 additions & 2 deletions include/stdexec/__detail/__preprocessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
#define STDEXEC_PP_IIF_0(_YP, ...) __VA_ARGS__
#define STDEXEC_PP_IIF_1(_YP, ...) _YP
#define STDEXEC_PP_IIF_EVAL(_MACRO, ...) _MACRO(__VA_ARGS__)
#define STDEXEC_PP_IIF_CAT(_XP, ...) _XP##__VA_ARGS__
#define STDEXEC_PP_IIF(_XP, _YP, ...) \
STDEXEC_PP_IIF_EVAL(STDEXEC_PP_CAT(STDEXEC_PP_IIF_, _XP), _YP, __VA_ARGS__)
STDEXEC_PP_IIF_EVAL(STDEXEC_PP_IIF_CAT(STDEXEC_PP_IIF_, _XP), _YP, __VA_ARGS__)

#define STDEXEC_PP_COMPL_0 1 // NOLINT(modernize-macro-to-enum)
#define STDEXEC_PP_COMPL_1 0 // NOLINT(modernize-macro-to-enum)
Expand All @@ -49,8 +50,9 @@
#define STDEXEC_PP_COUNT_I(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _NP, ...) _NP

// Used to check various properties of arguments
#define STDEXEC_PP_CHECK_EXPAND(...) __VA_ARGS__
#define STDEXEC_PP_CHECK_I(_XP, _NP, ...) _NP
#define STDEXEC_PP_CHECK(...) STDEXEC_PP_EXPAND(STDEXEC_PP_CHECK_I(__VA_ARGS__, 0, ))
#define STDEXEC_PP_CHECK(...) STDEXEC_PP_CHECK_EXPAND(STDEXEC_PP_CHECK_I(__VA_ARGS__, 0, ))
#define STDEXEC_PP_PROBE_I(_XP, _NP, ...) _XP, _NP,
#define STDEXEC_PP_PROBE(...) STDEXEC_PP_PROBE_I(__VA_ARGS__, 1)

Expand Down
22 changes: 2 additions & 20 deletions include/stdexec/__detail/__starts_on.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "__execution_fwd.hpp"

// include these after __execution_fwd.hpp
#include "../functional.hpp"
#include "__completion_signatures_of.hpp"
#include "__concepts.hpp"
#include "__diagnostics.hpp"
Expand All @@ -30,25 +31,6 @@

namespace STDEXEC
{
namespace __detail
{
//! Constant function object always returning `__val_`.
template <class _Ty, class = __demangle_t<__decay_t<_Ty>>>
struct __always
{
_Ty __val_;

STDEXEC_ATTRIBUTE(always_inline)
constexpr auto operator()() noexcept(__nothrow_move_constructible<_Ty>) -> _Ty
{
return static_cast<_Ty&&>(__val_);
}
};

template <class _Ty>
__always(_Ty) -> __always<_Ty>;
} // namespace __detail

/////////////////////////////////////////////////////////////////////////////
// [execution.senders.adaptors.starts_on]
struct starts_on_t
Expand All @@ -66,7 +48,7 @@ namespace STDEXEC
{
auto& [__tag, __sched, __child] = __sndr;
return let_value(continues_on(just(), __sched),
__detail::__always{STDEXEC::__forward_like<_Sender>(__child)});
__always{STDEXEC::__forward_like<_Sender>(__child)});
}

template <class _Sender>
Expand Down
19 changes: 19 additions & 0 deletions include/stdexec/functional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,25 @@ namespace STDEXEC
template <class _Fn>
STDEXEC_HOST_DEVICE_DEDUCTION_GUIDE __for_each(_Fn) -> __for_each<_Fn>;

//! Constant function object always returning `__value_`.
template <class _Ty>
struct __always
{
template <class _Self, class... _Ts>
STDEXEC_ATTRIBUTE(host, device, always_inline)
constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self&& __self, _Ts&&...) noexcept
-> auto&&
{
return (static_cast<_Self&&>(__self).__value_);
}
STDEXEC_EXPLICIT_THIS_END(operator())

_Ty __value_;
};

template <class _Ty>
STDEXEC_HOST_DEVICE_DEDUCTION_GUIDE __always(_Ty) -> __always<std::unwrap_reference_t<_Ty>>;

template <class _Ty>
struct __construct
{
Expand Down