diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-21 11:30:55 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-21 17:46:42 +0000 |
commit | cbd05ca5ab1231d70d07e1ffbe64c1b7338bf1d6 (patch) | |
tree | 3b0aa0a1c9458a0f535f189fd982e8cc854243fa /libstdc++-v3 | |
parent | ed77dcb9be76e592b62449c75a5e751485514afd (diff) | |
download | gcc-cbd05ca5ab1231d70d07e1ffbe64c1b7338bf1d6.zip gcc-cbd05ca5ab1231d70d07e1ffbe64c1b7338bf1d6.tar.gz gcc-cbd05ca5ab1231d70d07e1ffbe64c1b7338bf1d6.tar.bz2 |
libstdc++: Reduce size of std::bind_front(F) result
When there are no bound arguments to a std::bind_front call we don't
need the overhead of compiling, initializing, and accessing an empty
tuple.
libstdc++-v3/ChangeLog:
* include/std/functional (_Bind_front0): New class template.
(_Bind_front_t): Use _Bind_front0 when there are no bound
arguments.
* testsuite/20_util/function_objects/bind_front/107784.cc:
New test.
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/include/std/functional | 62 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc | 15 |
2 files changed, 76 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index b396e8d..dddd22f 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -995,9 +995,69 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::tuple<_BoundArgs...> _M_bound_args; }; + // Avoid the overhead of an empty tuple<> if there are no bound args. + template<typename _Fd> + struct _Bind_front0 + { + static_assert(is_move_constructible_v<_Fd>); + + // First parameter is to ensure this constructor is never used + // instead of the copy/move constructor. + template<typename _Fn> + explicit constexpr + _Bind_front0(int, _Fn&& __fn) + noexcept(is_nothrow_constructible_v<_Fd, _Fn>) + : _M_fd(std::forward<_Fn>(__fn)) + { } + + _Bind_front0(const _Bind_front0&) = default; + _Bind_front0(_Bind_front0&&) = default; + _Bind_front0& operator=(const _Bind_front0&) = default; + _Bind_front0& operator=(_Bind_front0&&) = default; + ~_Bind_front0() = default; + + template<typename... _CallArgs> + constexpr + invoke_result_t<_Fd&, _CallArgs...> + operator()(_CallArgs&&... __call_args) & + noexcept(is_nothrow_invocable_v<_Fd&, _CallArgs...>) + { return std::invoke(_M_fd, std::forward<_CallArgs>(__call_args)...); } + + template<typename... _CallArgs> + constexpr + invoke_result_t<const _Fd&, _CallArgs...> + operator()(_CallArgs&&... __call_args) const & + noexcept(is_nothrow_invocable_v<const _Fd&, _CallArgs...>) + { return std::invoke(_M_fd, std::forward<_CallArgs>(__call_args)...); } + + template<typename... _CallArgs> + constexpr + invoke_result_t<_Fd, _CallArgs...> + operator()(_CallArgs&&... __call_args) && + noexcept(is_nothrow_invocable_v<_Fd, _CallArgs...>) + { + return std::invoke(std::move(_M_fd), + std::forward<_CallArgs>(__call_args)...); + } + + template<typename... _CallArgs> + constexpr + invoke_result_t<const _Fd, _CallArgs...> + operator()(_CallArgs&&... __call_args) const && + noexcept(is_nothrow_invocable_v<const _Fd, _CallArgs...>) + { + return std::invoke(std::move(_M_fd), + std::forward<_CallArgs>(__call_args)...); + } + + private: + _Fd _M_fd; + }; + template<typename _Fn, typename... _Args> using _Bind_front_t - = _Bind_front<decay_t<_Fn>, decay_t<_Args>...>; + = __conditional_t<sizeof...(_Args) == 0, _Bind_front0<decay_t<_Fn>>, + _Bind_front<decay_t<_Fn>, decay_t<_Args>...>>; /** Create call wrapper by partial application of arguments to function. * diff --git a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc new file mode 100644 index 0000000..ec255f3 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc @@ -0,0 +1,15 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include <functional> + +struct Foo +{ + void func() {} +}; + +void bar() { } + +// PR libstdc++/107784 +static_assert( sizeof(std::bind_front(&Foo::func)) == sizeof(&Foo::func) ); +static_assert( sizeof(std::bind_front(&bar)) == sizeof(&bar) ); |