From 96be8df23ef2eb47631fc24481d76a19899cd7ee Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 2 Dec 2016 21:17:51 +0000 Subject: Add tests for libc++'s constexpr variant copy/move extension llvm-svn: 288536 --- .../variant.variant/variant.assign/copy.pass.cpp | 24 ++++++++++++++++++++++ .../variant.variant/variant.assign/move.pass.cpp | 24 ++++++++++++++++++++++ .../variant.variant/variant.ctor/copy.pass.cpp | 22 ++++++++++++++++++++ .../variant.variant/variant.ctor/move.pass.cpp | 23 +++++++++++++++++++++ 4 files changed, 93 insertions(+) diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp index ba2b3ca07979..95d5af9d2768 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp @@ -385,6 +385,29 @@ void test_copy_assignment_different_index() { #endif } +template +constexpr bool test_constexpr_assign_extension_imp( + std::variant&& v, ValueType&& new_value) +{ + const std::variant cp( + std::forward(new_value)); + v = cp; + return v.index() == NewIdx && + std::get(v) == std::get(cp); +} + +void test_constexpr_move_ctor_extension() { +#ifdef _LIBCPP_VERSION + using V = std::variant; + static_assert(std::is_trivially_copyable::value, ""); + static_assert(std::is_trivially_copy_assignable::value, ""); + static_assert(test_constexpr_assign_extension_imp<0>(V(42l), 101l), ""); + static_assert(test_constexpr_assign_extension_imp<0>(V(nullptr), 101l), ""); + static_assert(test_constexpr_assign_extension_imp<1>(V(42l), nullptr), ""); + static_assert(test_constexpr_assign_extension_imp<2>(V(42l), 101), ""); +#endif +} + int main() { test_copy_assignment_empty_empty(); test_copy_assignment_non_empty_empty(); @@ -393,4 +416,5 @@ int main() { test_copy_assignment_different_index(); test_copy_assignment_sfinae(); test_copy_assignment_not_noexcept(); + test_constexpr_copy_assignment_extension(); } diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp index 659156b5179d..d10bd2d4956a 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp @@ -308,6 +308,29 @@ void test_move_assignment_different_index() { #endif } +template +constexpr bool test_constexpr_assign_extension_imp( + std::variant&& v, ValueType&& new_value) +{ + std::variant v2( + std::forward(new_value)); + const auto cp = v2; + v = std::move(v2); + return v.index() == NewIdx && + std::get(v) == std::get(cp); +} + +void test_constexpr_move_ctor_extension() { +#ifdef _LIBCPP_VERSION + using V = std::variant; + static_assert(std::is_trivially_copyable::value, ""); + static_assert(std::is_trivially_move_assignable::value, ""); + static_assert(test_constexpr_assign_extension_imp<0>(V(42l), 101l), ""); + static_assert(test_constexpr_assign_extension_imp<0>(V(nullptr), 101l), ""); + static_assert(test_constexpr_assign_extension_imp<1>(V(42l), nullptr), ""); + static_assert(test_constexpr_assign_extension_imp<2>(V(42l), 101), ""); +#endif +} int main() { test_move_assignment_empty_empty(); test_move_assignment_non_empty_empty(); @@ -316,4 +339,5 @@ int main() { test_move_assignment_different_index(); test_move_assignment_sfinae(); test_move_assignment_noexcept(); + test_constexpr_move_assignment_extension(); } diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp index 90f4f2c56558..78fab6258b40 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp @@ -130,8 +130,30 @@ void test_copy_ctor_valueless_by_exception() { #endif } +template +constexpr bool test_constexpr_copy_ctor_extension_imp( + std::variant const& v) +{ + auto v2 = v; + return v2.index() == v.index() && + v2.index() == Idx && + std::get(v2) == std::get(v); +} + +void test_constexpr_copy_ctor_extension() { +#ifdef _LIBCPP_VERSION + using V = std::variant; + static_assert(std::is_trivially_copyable::value, ""); + static_assert(std::is_trivially_copy_constructible::value, ""); + static_assert(test_constexpr_copy_ctor_extension_imp<0>(V(42l)), ""); + static_assert(test_constexpr_copy_ctor_extension_imp<1>(V(nullptr)), ""); + static_assert(test_constexpr_copy_ctor_extension_imp<2>(V(101)), ""); +#endif +} + int main() { test_copy_ctor_basic(); test_copy_ctor_valueless_by_exception(); test_copy_ctor_sfinae(); + test_constexpr_copy_ctor_extension(); } diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp index dcc973f074f2..2a87f32ef9a4 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp @@ -166,9 +166,32 @@ void test_move_ctor_valueless_by_exception() { #endif } +template +constexpr bool test_constexpr_ctor_extension_imp( + std::variant const& v) +{ + auto copy = v; + auto v2 = std::move(copy); + return v2.index() == v.index() && + v2.index() == Idx && + std::get(v2) == std::get(v); +} + +void test_constexpr_move_ctor_extension() { +#ifdef _LIBCPP_VERSION + using V = std::variant; + static_assert(std::is_trivially_copyable::value, ""); + static_assert(std::is_trivially_move_constructible::value, ""); + static_assert(test_constexpr_ctor_extension_imp<0>(V(42l)), ""); + static_assert(test_constexpr_ctor_extension_imp<1>(V(nullptr)), ""); + static_assert(test_constexpr_ctor_extension_imp<2>(V(101)), ""); +#endif +} + int main() { test_move_ctor_basic(); test_move_ctor_valueless_by_exception(); test_move_noexcept(); test_move_ctor_sfinae(); + test_constexpr_move_ctor_extension(); } -- cgit v1.2.3