From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1E8C939AF40C; Fri, 11 Jun 2021 22:26:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E8C939AF40C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8561] libstdc++: Finish implementing LWG 3413 for propagate_const X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: e198d93d49f89a3b69f9b4e4c305f9f8b511027a X-Git-Newrev: ef636c00054bc31e45e2d0fc02125fb7613a6c70 Message-Id: <20210611222608.1E8C939AF40C@sourceware.org> Date: Fri, 11 Jun 2021 22:26:08 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 22:26:08 -0000 https://gcc.gnu.org/g:ef636c00054bc31e45e2d0fc02125fb7613a6c70 commit r11-8561-gef636c00054bc31e45e2d0fc02125fb7613a6c70 Author: Jonathan Wakely Date: Tue Jun 8 14:56:57 2021 +0100 libstdc++: Finish implementing LWG 3413 for propagate_const We already have conditional noexcept so this just constrains the non-member swap overload. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/experimental/propagate_const (swap): Constrain. * testsuite/experimental/propagate_const/swap/lwg3413.cc: New test. (cherry picked from commit d319517e809ee50496db29e552f86a83a14c837c) Diff: --- libstdc++-v3/include/experimental/propagate_const | 8 ++++- .../experimental/propagate_const/swap/lwg3413.cc | 41 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/experimental/propagate_const b/libstdc++-v3/include/experimental/propagate_const index 0d03c13c5e1..162b4783dd7 100644 --- a/libstdc++-v3/include/experimental/propagate_const +++ b/libstdc++-v3/include/experimental/propagate_const @@ -113,6 +113,7 @@ inline namespace fundamentals_v2 constexpr propagate_const() = default; propagate_const(const propagate_const& __p) = delete; constexpr propagate_const(propagate_const&& __p) = default; + template , is_convertible<_Up&&, _Tp>>::value, bool @@ -120,6 +121,7 @@ inline namespace fundamentals_v2 constexpr propagate_const(propagate_const<_Up>&& __pu) : _M_t(std::move(get_underlying(__pu))) {} + template , __not_>>::value, @@ -127,6 +129,7 @@ inline namespace fundamentals_v2 constexpr explicit propagate_const(propagate_const<_Up>&& __pu) : _M_t(std::move(get_underlying(__pu))) {} + template , is_convertible<_Up&&, _Tp>, @@ -136,6 +139,7 @@ inline namespace fundamentals_v2 constexpr propagate_const(_Up&& __u) : _M_t(std::forward<_Up>(__u)) {} + template , __not_>, @@ -399,8 +403,10 @@ inline namespace fundamentals_v2 } // [propagate_const.algorithms], specialized algorithms + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3413. propagate_const's swap [...] needs to be constrained and use a trait template - constexpr void + constexpr enable_if_t<__is_swappable<_Tp>::value, void> swap(propagate_const<_Tp>& __pt, propagate_const<_Tp>& __pt2) noexcept(__is_nothrow_swappable<_Tp>::value) { diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/swap/lwg3413.cc b/libstdc++-v3/testsuite/experimental/propagate_const/swap/lwg3413.cc new file mode 100644 index 00000000000..8dc13cfebdd --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/propagate_const/swap/lwg3413.cc @@ -0,0 +1,41 @@ +// { dg-do compile { target c++14 } } + +// LWG 3413 +// propagate_const's swap's noexcept specification needs to be constrained +// and use a trait + +#include + +using std::experimental::propagate_const; + +propagate_const i; +static_assert( noexcept(i.swap(i)), "member swap is noexcept" ); +static_assert( noexcept(swap(i, i)), "non-member swap is noexcept" ); + +struct P +{ + int i = 0; + int& operator*() const; +}; + +void swap(P&, P&) noexcept(false); + +propagate_const

p; +static_assert( ! noexcept(p.swap(p)), "member swap is conditionally noexcept" ); +static_assert( ! noexcept(swap(p, p)), "non-member swap is conditionally noexcept" ); + +// std::is_swappable not available for -std=c++14 +#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) +struct Q +{ + int i = 0; + int& operator*() const; + + Q& operator=(Q&&) = delete; +}; + +static_assert( ! std::is_swappable::value, "" ); + +static_assert( ! std::is_swappable>::value, + "non-member swap is constrained" ); +#endif