diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-11-13 19:54:31 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-11-13 19:54:31 +0000 |
| commit | 40905833b59cd84f18022a96e8281d924f70ca08 (patch) | |
| tree | 11b54f25b7b62fb33763ab6ce28f269887675270 | |
| parent | 6ac46b42ac3e80ba0d38bd156477ca6be8b5e8ab (diff) | |
| download | bcm5719-llvm-40905833b59cd84f18022a96e8281d924f70ca08.tar.gz bcm5719-llvm-40905833b59cd84f18022a96e8281d924f70ca08.zip | |
Fix PR30979 - tuple<move_only> is constructible from move_only const&
llvm-svn: 286774
| -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 7e1c942001e..9f6661fd97c 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -632,7 +632,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_implicit<_Tp...>(), + >::template __enable_implicit<_Tp const&...>(), bool >::type = false > @@ -650,7 +650,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_explicit<_Tp...>(), + >::template __enable_explicit<_Tp const&...>(), bool >::type = false > @@ -668,7 +668,7 @@ public: < _CheckArgsConstructor< _Dummy - >::template __enable_implicit<_Tp...>(), + >::template __enable_implicit<_Tp const&...>(), bool >::type = false > @@ -687,7 +687,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 1bd7d6d4e8a..0c93673532b 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>(); + } } |
