From owner-svn-src-vendor@freebsd.org Fri Nov 25 19:11:47 2016 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF0FEC54641; Fri, 25 Nov 2016 19:11:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89BDAE61; Fri, 25 Nov 2016 19:11:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAPJBk0W075973; Fri, 25 Nov 2016 19:11:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAPJBkAk075971; Fri, 25 Nov 2016 19:11:46 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201611251911.uAPJBkAk075971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 25 Nov 2016 19:11:46 +0000 (UTC) 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 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2016 19:11:47 -0000 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 +void test_sfinae() { + using Tup = std::tuple; + using Alloc = std::allocator; + using Tag = std::allocator_arg_t; + // special members + { + static_assert(std::is_default_constructible::value, ""); + static_assert(std::is_move_constructible::value, ""); + static_assert(!std::is_copy_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + } + // args constructors + { + static_assert(std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + } + // uses-allocator special member constructors + { + static_assert(std::is_constructible::value, ""); + static_assert(std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + } + // uses-allocator args constructors + { + static_assert(std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + static_assert(!std::is_constructible::value, ""); + } +} + int main() { { @@ -72,4 +118,8 @@ int main() d_t d((ConstructsWithTupleLeaf())); d_t d2(static_cast(d)); } + { + test_sfinae(); + test_sfinae(); + } }