diff options
| author |   Eric Fiselier <eric@efcs.ca> | 2016-11-20 21:33:12 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-11-20 21:33:12 +0000 |
| commit | 241927e480c09e5491c6945b7220275d75e62fd7 (patch) | |
| tree | 26918ab71308da98aae25d30fb15433b18beeb51 | |
| parent | [3.9.1] Merging r287359: (diff) | |
| download | llvm-project-241927e480c09e5491c6945b7220275d75e62fd7.tar.gz llvm-project-241927e480c09e5491c6945b7220275d75e62fd7.tar.bz2 llvm-project-241927e480c09e5491c6945b7220275d75e62fd7.zip | |
Merge r286774 - Fixes PR30979
llvm-svn: 287507
| -rw-r--r-- | libcxx/include/tuple | 8 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp | 50 |
2 files changed, 54 insertions, 4 deletions
diff --git a/libcxx/include/tuple b/libcxx/include/tuple index 6805d8c7635b..744a3ff032d0 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -681,7 +681,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_implicit<_Tp...>(), + >::template __enable_implicit<_Tp const&...>(), bool >::type = false > @@ -699,7 +699,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_explicit<_Tp...>(), + >::template __enable_explicit<_Tp const&...>(), bool >::type = false > @@ -717,7 +717,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_implicit<_Tp...>(), + >::template __enable_implicit<_Tp const&...>(), bool >::type = false > @@ -736,7 +736,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_explicit<_Tp...>(), + >::template __enable_explicit<_Tp const&...>(), bool >::type = false > diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp index 1bd7d6d4e8a8..0c93673532bb 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp @@ -35,6 +35,52 @@ struct ConstructsWithTupleLeaf } }; +// move_only type which triggers the empty base optimization +struct move_only_ebo { + move_only_ebo() = default; + move_only_ebo(move_only_ebo&&) = default; +}; + +// a move_only type which does not trigger the empty base optimization +struct move_only_large final { + move_only_large() : value(42) {} + move_only_large(move_only_large&&) = default; + int value; +}; + +template <class Elem> +void test_sfinae() { + using Tup = std::tuple<Elem>; + using Alloc = std::allocator<void>; + using Tag = std::allocator_arg_t; + // special members + { + static_assert(std::is_default_constructible<Tup>::value, ""); + static_assert(std::is_move_constructible<Tup>::value, ""); + static_assert(!std::is_copy_constructible<Tup>::value, ""); + static_assert(!std::is_constructible<Tup, Tup&>::value, ""); + } + // args constructors + { + static_assert(std::is_constructible<Tup, Elem&&>::value, ""); + static_assert(!std::is_constructible<Tup, Elem const&>::value, ""); + static_assert(!std::is_constructible<Tup, Elem&>::value, ""); + } + // uses-allocator special member constructors + { + static_assert(std::is_constructible<Tup, Tag, Alloc>::value, ""); + static_assert(std::is_constructible<Tup, Tag, Alloc, Tup&&>::value, ""); + static_assert(!std::is_constructible<Tup, Tag, Alloc, Tup const&>::value, ""); + static_assert(!std::is_constructible<Tup, Tag, Alloc, Tup &>::value, ""); + } + // uses-allocator args constructors + { + static_assert(std::is_constructible<Tup, Tag, Alloc, Elem&&>::value, ""); + static_assert(!std::is_constructible<Tup, Tag, Alloc, Elem const&>::value, ""); + static_assert(!std::is_constructible<Tup, Tag, Alloc, Elem &>::value, ""); + } +} + int main() { { @@ -72,4 +118,8 @@ int main() d_t d((ConstructsWithTupleLeaf())); d_t d2(static_cast<d_t &&>(d)); } + { + test_sfinae<move_only_ebo>(); + test_sfinae<move_only_large>(); + } } |