From 0187e0d7360f327f88d8b2294668669306ae4630 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 19 Aug 2021 11:48:40 +0100 Subject: [PATCH] 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. --- libstdc++-v3/include/std/tuple | 6 +++++- libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/20_util/tuple/cons/101960.cc diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 1292aee45c03..f082ccb8a3ba 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -438,11 +438,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 000000000000..f14604cdc697 --- /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 -- 2.47.2