From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E7A7B3857C71; Tue, 12 Oct 2021 10:59:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7A7B3857C71 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-9116] libstdc++: Fix move construction of std::tuple with array elements [PR101960] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 822bd7f6a2fad3821f501d5a814a771a0c3a09fa X-Git-Newrev: 00967465fe8093661a4d42356821eeb04170e09d Message-Id: <20211012105948.E7A7B3857C71@sourceware.org> Date: Tue, 12 Oct 2021 10:59:48 +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: Tue, 12 Oct 2021 10:59:49 -0000 https://gcc.gnu.org/g:00967465fe8093661a4d42356821eeb04170e09d commit r11-9116-g00967465fe8093661a4d42356821eeb04170e09d Author: Jonathan Wakely Date: Thu Aug 19 11:48:40 2021 +0100 libstdc++: Fix move construction of std::tuple with array elements [PR101960] An array member cannot be direct-initialized in a ctor-initializer-list, so use the base class' move constructor, which does the right thing for both arrays and non-arrays. This constructor could be defaulted, but that would make it trivial for some specializations, which would change the argument passing ABI. Do that for the versioned namespace only. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/101960 * include/std/tuple (_Tuple_impl(_Tuple_impl&&)): Use base class' move constructor. Define as defaulted for versioned namespace. * testsuite/20_util/tuple/cons/101960.cc: New test. (cherry picked from commit 0187e0d7360f327f88d8b2294668669306ae4630) Diff: --- libstdc++-v3/include/std/tuple | 6 +++++- libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index d2574a3a7cc..23fad918c57 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -453,11 +453,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 2729. Missing SFINAE on std::pair::operator= _Tuple_impl& operator=(const _Tuple_impl&) = delete; +#if _GLIBCXX_INLINE_VERSION + _Tuple_impl(_Tuple_impl&&) = default; +#else constexpr _Tuple_impl(_Tuple_impl&& __in) noexcept(is_nothrow_move_constructible<_Head>::value) - : _Base(std::forward<_Head>(_M_head(__in))) + : _Base(static_cast<_Base&&>(__in)) { } +#endif template constexpr diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc new file mode 100644 index 00000000000..f14604cdc69 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc @@ -0,0 +1,4 @@ +// { dg-do compile { target c++11 } } +#include +std::tuple t; +auto tt = std::move(t); // PR libstdc++/101960