From 5f00d0d5c2a43a37e505941c16df52ef12179d41 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Apr 2019 20:27:27 +0100 Subject: [PATCH] Fix condition for std::variant to be copy constructible The standard says the std::variant copy constructor is defined as deleted unless all alternative types are copy constructible, but we were making it also depend on move constructible. Fix the condition and enhance the tests to check the semantics with pathological copy-only types (i.e. supporting copying but having deleted moves). The enhanced tests revealed a regression in copy assignment for non-trivial alternative types, where the assignment would not be performed because the condition in the _Copy_assign_base visitor is false: is_same_v, remove_reference_t>. * include/std/variant (__detail::__variant::_Traits::_S_copy_assign): Do not depend on whether all alternative types are move constructible. (__detail::__variant::_Copy_assign_base::operator=): Remove cv-quals from the operand when deciding whether to perform the assignment. * testsuite/20_util/variant/compile.cc (DeletedMoves): Define type with deleted move constructor and deleted move assignment operator. (default_ctor, copy_ctor, move_ctor, copy_assign, move_assign): Check behaviour of variants with DeletedMoves as an alternative. * testsuite/20_util/variant/run.cc (DeletedMoves): Define same type. (move_ctor, move_assign): Check that moving a variant with a DeletedMoves alternative falls back to copying instead of moving. From-SVN: r270425 --- libstdc++-v3/ChangeLog | 12 ++++++++++ libstdc++-v3/include/std/variant | 4 ++-- .../testsuite/20_util/variant/compile.cc | 14 ++++++++++++ libstdc++-v3/testsuite/20_util/variant/run.cc | 22 +++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 701e349693c..0d5e490befe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,17 @@ 2019-04-17 Jonathan Wakely + * include/std/variant (__detail::__variant::_Traits::_S_copy_assign): + Do not depend on whether all alternative types are move constructible. + (__detail::__variant::_Copy_assign_base::operator=): Remove cv-quals + from the operand when deciding whether to perform the assignment. + * testsuite/20_util/variant/compile.cc (DeletedMoves): Define type + with deleted move constructor and deleted move assignment operator. + (default_ctor, copy_ctor, move_ctor, copy_assign, move_assign): Check + behaviour of variants with DeletedMoves as an alternative. + * testsuite/20_util/variant/run.cc (DeletedMoves): Define same type. + (move_ctor, move_assign): Check that moving a variant with a + DeletedMoves alternative falls back to copying instead of moving. + * testsuite/20_util/variant/compile.cc: Remove empty string literals from static_assert declarations. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 22b0c3d5c22..e153363bbf3 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -279,7 +279,7 @@ namespace __variant static constexpr bool _S_move_ctor = (is_move_constructible_v<_Types> && ...); static constexpr bool _S_copy_assign = - _S_copy_ctor && _S_move_ctor + _S_copy_ctor && (is_copy_assignable_v<_Types> && ...); static constexpr bool _S_move_assign = _S_move_ctor @@ -613,7 +613,7 @@ namespace __variant __variant::__get<__rhs_index>(*this); if constexpr (is_same_v< remove_reference_t, - remove_reference_t>) + __remove_cvref_t>) __this_mem = __rhs_mem; } } diff --git a/libstdc++-v3/testsuite/20_util/variant/compile.cc b/libstdc++-v3/testsuite/20_util/variant/compile.cc index b67c98adf4a..5cc2a9460a9 100644 --- a/libstdc++-v3/testsuite/20_util/variant/compile.cc +++ b/libstdc++-v3/testsuite/20_util/variant/compile.cc @@ -63,6 +63,15 @@ struct MoveCtorOnly struct MoveCtorAndSwapOnly : MoveCtorOnly { }; void swap(MoveCtorAndSwapOnly&, MoveCtorAndSwapOnly&) { } +struct DeletedMoves +{ + DeletedMoves() = default; + DeletedMoves(const DeletedMoves&) = default; + DeletedMoves(DeletedMoves&&) = delete; + DeletedMoves& operator=(const DeletedMoves&) = default; + DeletedMoves& operator=(DeletedMoves&&) = delete; +}; + struct nonliteral { nonliteral() { } @@ -81,6 +90,7 @@ void default_ctor() static_assert(is_default_constructible_v>); static_assert(!is_default_constructible_v>); static_assert(is_default_constructible_v>); + static_assert(is_default_constructible_v>); static_assert(noexcept(variant())); static_assert(!noexcept(variant())); @@ -93,6 +103,7 @@ void copy_ctor() static_assert(!is_copy_constructible_v>); static_assert(is_trivially_copy_constructible_v>); static_assert(!is_trivially_copy_constructible_v>); + static_assert(is_trivially_copy_constructible_v>); { variant a; @@ -116,6 +127,7 @@ void move_ctor() { static_assert(is_move_constructible_v>); static_assert(!is_move_constructible_v>); + static_assert(is_move_constructible_v>); // uses copy ctor static_assert(is_trivially_move_constructible_v>); static_assert(!is_trivially_move_constructible_v>); static_assert(!noexcept(variant(declval>()))); @@ -157,6 +169,7 @@ void copy_assign() static_assert(!is_copy_assignable_v>); static_assert(is_trivially_copy_assignable_v>); static_assert(!is_trivially_copy_assignable_v>); + static_assert(is_trivially_copy_assignable_v>); { variant a; static_assert(!noexcept(a = a)); @@ -171,6 +184,7 @@ void move_assign() { static_assert(is_move_assignable_v>); static_assert(!is_move_assignable_v>); + static_assert(is_move_assignable_v>); // uses copy assignment static_assert(is_trivially_move_assignable_v>); static_assert(!is_trivially_move_assignable_v>); { diff --git a/libstdc++-v3/testsuite/20_util/variant/run.cc b/libstdc++-v3/testsuite/20_util/variant/run.cc index 3ca375d374e..c0f48432ca1 100644 --- a/libstdc++-v3/testsuite/20_util/variant/run.cc +++ b/libstdc++-v3/testsuite/20_util/variant/run.cc @@ -57,6 +57,15 @@ struct AlwaysThrow bool operator>(const AlwaysThrow&) const { VERIFY(false); } }; +struct DeletedMoves +{ + DeletedMoves() = default; + DeletedMoves(const DeletedMoves&) = default; + DeletedMoves(DeletedMoves&&) = delete; + DeletedMoves& operator=(const DeletedMoves&) = default; + DeletedMoves& operator=(DeletedMoves&&) = delete; +}; + void default_ctor() { variant v; @@ -80,6 +89,12 @@ void move_ctor() VERIFY(holds_alternative(u)); VERIFY(get(u) == "a"); VERIFY(holds_alternative(v)); + + variant, DeletedMoves> d{std::in_place_index<0>, {1, 2, 3, 4}}; + // DeletedMoves is not move constructible, so this uses copy ctor: + variant, DeletedMoves> e(std::move(d)); + VERIFY(std::get<0>(d).size() == 4); + VERIFY(std::get<0>(e).size() == 4); } void arbitrary_ctor() @@ -137,6 +152,13 @@ void move_assign() VERIFY(holds_alternative(u)); VERIFY(get(u) == "a"); VERIFY(holds_alternative(v)); + + variant, DeletedMoves> d{std::in_place_index<0>, {1, 2, 3, 4}}; + variant, DeletedMoves> e; + // DeletedMoves is not move assignable, so this uses copy assignment: + e = std::move(d); + VERIFY(std::get<0>(d).size() == 4); + VERIFY(std::get<0>(e).size() == 4); } void arbitrary_assign() -- 2.30.2