Hui Xie 16719cd011 [libc++] P2321R2 section [tuple.tuple]. Adding C++23 constructors, assignment operators and swaps to tuple
1. for constructors that takes cvref variation of tuple<UTypes...>, there
used to be two SFINAE helper _EnableCopyFromOtherTuple,
_EnableMoveFromOtherTuple. And the implementations of these two helpers
seem to slightly differ from the spec. But now, we need 4 variations.
Instead of adding another two, this change refactored it to a single one
_EnableCtrFromUTypesTuple, which directly maps to the spec without
changing the C++11 behaviour. However, we need the helper __copy_cvref_t
to get the type of std::get<i>(cvref tuple<Utypes...>) for different
cvref, so I made __copy_cvref_t to be available in C++11.

2. for constructors that takes variations of std::pair, there used to be
four helpers _EnableExplicitCopyFromPair, _EnableImplicitCopyFromPair,
_EnableImplicitMoveFromPair, _EnableExplicitMoveFromPair. Instead of
adding another four, this change refactored into two helper
_EnableCtrFromPair and _BothImplicitlyConvertible. This also removes the
need to use _nat

3. for const member assignment operator, since the requirement is very
simple, I haven't refactored the old code but instead directly adding
the new c++23 code.

4. for const swap, I pretty much copy pasted the non-const version to make
these overloads look consistent

5. while doing these change, I found two of the old constructors wasn't
marked constexpr for C++20 but they should. fixed them and added unit
tests

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D116621
2022-06-24 07:12:53 +01:00

74 lines
1.7 KiB
C++

//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// <tuple>
// template <class... Types> class tuple;
// void swap(tuple& rhs);
// UNSUPPORTED: c++03
#include <tuple>
#include <cassert>
#include "test_macros.h"
#include "MoveOnly.h"
TEST_CONSTEXPR_CXX20
bool test()
{
{
typedef std::tuple<> T;
T t0;
T t1;
t0.swap(t1);
}
{
typedef std::tuple<MoveOnly> T;
T t0(MoveOnly(0));
T t1(MoveOnly(1));
t0.swap(t1);
assert(std::get<0>(t0) == 1);
assert(std::get<0>(t1) == 0);
}
{
typedef std::tuple<MoveOnly, MoveOnly> T;
T t0(MoveOnly(0), MoveOnly(1));
T t1(MoveOnly(2), MoveOnly(3));
t0.swap(t1);
assert(std::get<0>(t0) == 2);
assert(std::get<1>(t0) == 3);
assert(std::get<0>(t1) == 0);
assert(std::get<1>(t1) == 1);
}
{
typedef std::tuple<MoveOnly, MoveOnly, MoveOnly> T;
T t0(MoveOnly(0), MoveOnly(1), MoveOnly(2));
T t1(MoveOnly(3), MoveOnly(4), MoveOnly(5));
t0.swap(t1);
assert(std::get<0>(t0) == 3);
assert(std::get<1>(t0) == 4);
assert(std::get<2>(t0) == 5);
assert(std::get<0>(t1) == 0);
assert(std::get<1>(t1) == 1);
assert(std::get<2>(t1) == 2);
}
return true;
}
int main(int, char**)
{
test();
#if TEST_STD_VER > 17
static_assert(test());
#endif
return 0;
}