Author: ericwf
Date: Sun Nov 13 13:54:31 2016
New Revision: 286774
URL: http://llvm.org/viewvc/llvm-project?rev=286774&view=rev
Log:
Fix PR30979 - tuple<move_only> is constructible from move_only const&
Modified:
libcxx/trunk/include/tuple
libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
Modified: libcxx/trunk/include/tuple
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/tuple?rev=286774&r1=286773&r2=286774&view=diff
==============================================================================
--- libcxx/trunk/include/tuple (original)
+++ libcxx/trunk/include/tuple Sun Nov 13 13:54:31 2016
@@ -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
>
Modified:
libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp?rev=286774&r1=286773&r2=286774&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
(original)
+++ libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
Sun Nov 13 13:54:31 2016
@@ -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>();
+ }
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
