Date: Fri, 25 Nov 2016 19:11:46 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r309160 - in vendor/libc++/dist: include test/std/utilities/tuple/tuple.tuple/tuple.cnstr Message-ID: <201611251911.uAPJBkAk075971@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Nov 25 19:11:46 2016 New Revision: 309160 URL: https://svnweb.freebsd.org/changeset/base/309160 Log: Vendor import of libc++ release_39 branch r287912: https://llvm.org/svn/llvm-project/libcxx/branches/release_39@287912 Modified: vendor/libc++/dist/include/tuple vendor/libc++/dist/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp Modified: vendor/libc++/dist/include/tuple ============================================================================== --- vendor/libc++/dist/include/tuple Fri Nov 25 19:10:09 2016 (r309159) +++ vendor/libc++/dist/include/tuple Fri Nov 25 19:11:46 2016 (r309160) @@ -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 > Modified: vendor/libc++/dist/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp ============================================================================== --- vendor/libc++/dist/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp Fri Nov 25 19:10:09 2016 (r309159) +++ vendor/libc++/dist/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp Fri Nov 25 19:11:46 2016 (r309160) @@ -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>(); + } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611251911.uAPJBkAk075971>