From e2eab3c4edb6aa9a93f982c4554cd756000934ca Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 5 Jan 2023 11:35:35 +0000 Subject: [PATCH] =?utf8?q?libstdc++:=C2=A0Reduce=C2=A0size=C2=A0of=C2=A0st?= =?utf8?q?d::bind=5Ffront(empty=5Ftype)=C2=A0result=20[PR108290]?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libstdc++-v3/ChangeLog: PR libstdc++/108290 * include/std/functional (_Bind_front): Add no_unique_address attribute to data members. * testsuite/20_util/function_objects/bind_front/107784.cc: Check size of call wrappers with empty types for targets and bound arguments. --- libstdc++-v3/include/std/functional | 6 ++-- .../20_util/function_objects/bind_front/107784.cc | 38 +++++++++++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index dddd22fcd04..5dff5be089d 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -991,8 +991,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::forward<_CallArgs>(__call_args)...); } - _Fd _M_fd; - std::tuple<_BoundArgs...> _M_bound_args; + [[no_unique_address]] _Fd _M_fd; + [[no_unique_address]] std::tuple<_BoundArgs...> _M_bound_args; }; // Avoid the overhead of an empty tuple<> if there are no bound args. @@ -1051,7 +1051,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } private: - _Fd _M_fd; + [[no_unique_address]] _Fd _M_fd; }; template 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 index ec255f3ee36..f1f8cee4509 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/107784.cc @@ -10,6 +10,42 @@ struct Foo void bar() { } -// PR libstdc++/107784 +// PR libstdc++/107784 - QOI: sizeof( bind_front( Member-Function ) ) too big static_assert( sizeof(std::bind_front(&Foo::func)) == sizeof(&Foo::func) ); static_assert( sizeof(std::bind_front(&bar)) == sizeof(&bar) ); + +// PR libstdc++/108290 - QoI: bind_front captureless lambda is too big +auto empty_lambda = [](auto, auto) { return 0; }; + +struct { + void operator()(int, int, int) { } + template void operator()(T, T) { } +} empty_class; + +static_assert(sizeof(std::bind_front(empty_lambda)) == 1); +static_assert(sizeof(std::bind_front(empty_lambda, 1)) == sizeof(int)); +static_assert(sizeof(std::bind_front(empty_lambda, empty_lambda)) == 2); +static_assert(sizeof(std::bind_front(empty_lambda, empty_class)) == 1); +static_assert(sizeof(std::bind_front(empty_lambda, 1, 2)) == 2 * sizeof(int)); +static_assert(sizeof(std::bind_front(empty_lambda, '1', empty_lambda)) == 2); +static_assert(sizeof(std::bind_front(empty_lambda, '1', empty_class)) == 1); + +static_assert(sizeof(std::bind_front(empty_class)) == 1); +static_assert(sizeof(std::bind_front(empty_class, 1)) == sizeof(int)); +static_assert(sizeof(std::bind_front(empty_class, empty_lambda)) == 1); +static_assert(sizeof(std::bind_front(empty_class, empty_class)) == 2); +static_assert(sizeof(std::bind_front(empty_class, 1, 2)) == 2 * sizeof(int)); +static_assert(sizeof(std::bind_front(empty_class, '1', empty_lambda)) == 1); +static_assert(sizeof(std::bind_front(empty_class, '1', empty_class)) == 2); + +struct derived1 : decltype(std::bind_front(empty_class)) +{ + int i; +}; +static_assert(sizeof(derived1) == sizeof(int)); + +struct derived2 : decltype(std::bind_front(empty_class, empty_lambda)) +{ + int i; +}; +static_assert(sizeof(derived2) == sizeof(int)); -- 2.11.4.GIT