From 189f88ca35cd038da52bfdb338e37a0c15fa69bb Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 25 Jul 2016 01:45:07 +0000 Subject: [PATCH] Revert r276548 - Make pair/tuples assignment operators SFINAE properly. This is a breaking change. The SFINAE required is instantiated the second the class is instantiated, and this can cause hard SFINAE errors when applied to references to incomplete types. Ex. struct IncompleteType; extern IncompleteType it; std::tuple t(it); // SFINAE will blow up. llvm-svn: 276598 --- libcxx/include/tuple | 22 ------ libcxx/include/utility | 25 ++---- .../tuple/tuple.tuple/tuple.assign/copy.pass.cpp | 49 ------------ .../tuple/tuple.tuple/tuple.assign/move.pass.cpp | 69 ----------------- .../utility/pairs/pairs.pair/assign_pair.pass.cpp | 90 ---------------------- .../pairs/pairs.pair/assign_pair_cxx03.pass.cpp | 36 --------- .../pairs/pairs.pair/assign_rv_pair.pass.cpp | 68 +--------------- 7 files changed, 7 insertions(+), 352 deletions(-) delete mode 100644 libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp delete mode 100644 libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp diff --git a/libcxx/include/tuple b/libcxx/include/tuple index a68f115..31613d2 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -647,9 +647,6 @@ public: _LIBCPP_CONSTEXPR tuple() _NOEXCEPT_(__all::value...>::value) {} - tuple(tuple const&) = default; - tuple(tuple&&) = default; - template , @@ -888,25 +885,6 @@ public: tuple(allocator_arg_t, const _Alloc& __a, _Tuple&& __t) : base_(allocator_arg_t(), __a, _VSTD::forward<_Tuple>(__t)) {} - using _CanCopyAssign = __all::value...>; - using _CanMoveAssign = __all::value...>; - - _LIBCPP_INLINE_VISIBILITY - tuple& operator=(typename conditional<_CanCopyAssign::value, tuple, __nat>::type const& __t) - _NOEXCEPT_((__all::value...>::value)) - { - base_.operator=(__t.base_); - return *this; - } - - _LIBCPP_INLINE_VISIBILITY - tuple& operator=(typename conditional<_CanMoveAssign::value, tuple, __nat>::type&& __t) - _NOEXCEPT_((__all::value...>::value)) - { - base_.operator=(static_cast(__t.base_)); - return *this; - } - template ::type _T1Unref; - typedef typename remove_reference<_T2>::type _T2Unref; - -#if !defined(_LIBCPP_CXX03_LANG) - typedef integral_constant::value - && is_copy_assignable<_T2>::value> _CanCopyAssign; -#else - typedef true_type _CanCopyAssign; -#endif - _LIBCPP_INLINE_VISIBILITY - pair& operator=(typename conditional<_CanCopyAssign::value, pair, __nat>::type const& __p) + pair& operator=(const pair& __p) _NOEXCEPT_(is_nothrow_copy_assignable::value && is_nothrow_copy_assignable::value) { @@ -388,15 +377,10 @@ struct _LIBCPP_TYPE_VIS_ONLY pair : first(_VSTD::forward<_U1>(__p.first)), second(_VSTD::forward<_U2>(__p.second)) {} - typedef integral_constant::value - && is_move_assignable<_T2>::value> _CanMoveAssign; - _LIBCPP_INLINE_VISIBILITY pair& - operator=(typename conditional<_CanMoveAssign::value, pair, __nat>::type&& __p) - _NOEXCEPT_(is_nothrow_move_assignable::value && - is_nothrow_move_assignable::value) + operator=(pair&& __p) _NOEXCEPT_(is_nothrow_move_assignable::value && + is_nothrow_move_assignable::value) { first = _VSTD::forward(__p.first); second = _VSTD::forward(__p.second); @@ -404,6 +388,7 @@ struct _LIBCPP_TYPE_VIS_ONLY pair } #ifndef _LIBCPP_HAS_NO_VARIADICS + template::value>::type> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 @@ -426,7 +411,7 @@ struct _LIBCPP_TYPE_VIS_ONLY pair {} template ::type, pair>::value && __tuple_assignable<_Tuple, pair>::value>::type> + class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type> _LIBCPP_INLINE_VISIBILITY pair& operator=(_Tuple&& __p) diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp index 6a24c278..d5d0207 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp @@ -19,22 +19,6 @@ #include #include -#include "test_macros.h" - -struct NonAssignable { - NonAssignable& operator=(NonAssignable const&) = delete; - NonAssignable& operator=(NonAssignable&&) = delete; -}; -struct CopyAssignable { - CopyAssignable& operator=(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable &&) = delete; -}; -static_assert(std::is_copy_assignable::value, ""); -struct MoveAssignable { - MoveAssignable& operator=(MoveAssignable const&) = delete; - MoveAssignable& operator=(MoveAssignable&&) = default; -}; - int main() { { @@ -67,37 +51,4 @@ int main() assert(std::get<1>(t) == 'a'); assert(std::get<2>(t) == "some text"); } - { - // test reference assignment. - using T = std::tuple; - int x = 42; - int y = 100; - int x2 = -1; - int y2 = 500; - T t(x, std::move(y)); - T t2(x2, std::move(y2)); - t = t2; - assert(std::get<0>(t) == x2); - assert(&std::get<0>(t) == &x); - assert(std::get<1>(t) == y2); - assert(&std::get<1>(t) == &y); - } - { - // test that the implicitly generated copy assignment operator - // is properly deleted - using T = std::tuple>; - static_assert(!std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(!std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(!std::is_copy_assignable::value, ""); - } } diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp index 210f14b..fc5e41a 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp @@ -21,33 +21,6 @@ #include "MoveOnly.h" -struct NonAssignable { - NonAssignable& operator=(NonAssignable const&) = delete; - NonAssignable& operator=(NonAssignable&&) = delete; -}; -struct CopyAssignable { - CopyAssignable& operator=(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable&&) = delete; -}; -static_assert(std::is_copy_assignable::value, ""); -struct MoveAssignable { - MoveAssignable& operator=(MoveAssignable const&) = delete; - MoveAssignable& operator=(MoveAssignable&&) = default; -}; - - -struct CountAssign { - static int copied; - static int moved; - static void reset() { copied = moved = 0; } - CountAssign() = default; - CountAssign& operator=(CountAssign const&) { ++copied; return *this; } - CountAssign& operator=(CountAssign&&) { ++moved; return *this; } -}; -int CountAssign::copied = 0; -int CountAssign::moved = 0; - - int main() { { @@ -80,46 +53,4 @@ int main() assert(std::get<1>(t) == 1); assert(std::get<2>(t) == 2); } - { - // test reference assignment. - using T = std::tuple; - int x = 42; - int y = 100; - int x2 = -1; - int y2 = 500; - T t(x, std::move(y)); - T t2(x2, std::move(y2)); - t = std::move(t2); - assert(std::get<0>(t) == x2); - assert(&std::get<0>(t) == &x); - assert(std::get<1>(t) == y2); - assert(&std::get<1>(t) == &y); - } - { - // test that the implicitly generated move assignment operator - // is properly deleted - using T = std::tuple>; - static_assert(std::is_move_assignable::value, ""); - static_assert(!std::is_copy_assignable::value, ""); - - } - { - using T = std::tuple; - static_assert(!std::is_move_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(std::is_move_assignable::value, ""); - } - { - // The move should decay to a copy. - CountAssign::reset(); - using T = std::tuple; - static_assert(std::is_move_assignable::value, ""); - T t1; - T t2; - t1 = std::move(t2); - assert(CountAssign::copied == 1); - assert(CountAssign::moved == 0); - } } diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp deleted file mode 100644 index d75b6a5..0000000 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp +++ /dev/null @@ -1,90 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// UNSUPPORTED: c++98, c++03 - -// - -// template struct pair - -// pair& operator=(pair const& p); - -#include -#include -#include - - -struct NonAssignable { - NonAssignable& operator=(NonAssignable const&) = delete; - NonAssignable& operator=(NonAssignable&&) = delete; -}; -struct CopyAssignable { - CopyAssignable() = default; - CopyAssignable(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable&&) = delete; -}; -struct MoveAssignable { - MoveAssignable() = default; - MoveAssignable& operator=(MoveAssignable const&) = delete; - MoveAssignable& operator=(MoveAssignable&&) = default; -}; - - -struct CountAssign { - static int copied; - static int moved; - static void reset() { copied = moved = 0; } - CountAssign() = default; - CountAssign& operator=(CountAssign const&) { ++copied; return *this; } - CountAssign& operator=(CountAssign&&) { ++moved; return *this; } -}; -int CountAssign::copied = 0; -int CountAssign::moved = 0; - -int main() -{ - { - typedef std::pair P; - const P p1(CopyAssignable(), 4); - P p2; - p2 = p1; - assert(p2.second == 4); - } - { - using P = std::pair; - int x = 42; - int y = 101; - int x2 = -1; - int y2 = 300; - P p1(x, std::move(y)); - P p2(x2, std::move(y2)); - p1 = p2; - assert(p1.first == x2); - assert(p1.second == y2); - } - { - using P = std::pair; - static_assert(!std::is_copy_assignable

::value, ""); - } - { - CountAssign::reset(); - using P = std::pair; - static_assert(std::is_copy_assignable

::value, ""); - P p; - P p2; - p = p2; - assert(CountAssign::copied == 1); - assert(CountAssign::moved == 0); - } - { - using P = std::pair; - static_assert(!std::is_copy_assignable

::value, ""); - } -} diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp deleted file mode 100644 index 8b9d1ed..0000000 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp +++ /dev/null @@ -1,36 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// REQUIRES-ANY: c++98, c++03 - -// - -// template struct pair - -// pair& operator=(pair const& p); - -#include -#include -#include - - -struct NonAssignable { - NonAssignable() {} -private: - NonAssignable& operator=(NonAssignable const&); -}; - -int main() -{ - // Test that we don't constrain the assignment operator in C++03 mode. - // Since we don't have access control SFINAE having pair evaluate SFINAE - // may cause a hard error. - typedef std::pair P; - static_assert(std::is_copy_assignable

::value, ""); -} diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp index 3808920..a753ee5 100644 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp +++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03 - // // template struct pair @@ -19,35 +17,9 @@ #include #include - -struct NonAssignable { - NonAssignable& operator=(NonAssignable const&) = delete; - NonAssignable& operator=(NonAssignable&&) = delete; -}; -struct CopyAssignable { - CopyAssignable() = default; - CopyAssignable& operator=(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable&&) = delete; -}; -struct MoveAssignable { - MoveAssignable() = default; - MoveAssignable& operator=(MoveAssignable const&) = delete; - MoveAssignable& operator=(MoveAssignable&&) = default; -}; - -struct CountAssign { - static int copied; - static int moved; - static void reset() { copied = moved = 0; } - CountAssign() = default; - CountAssign& operator=(CountAssign const&) { ++copied; return *this; } - CountAssign& operator=(CountAssign&&) { ++moved; return *this; } -}; -int CountAssign::copied = 0; -int CountAssign::moved = 0; - int main() { +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { typedef std::pair, short> P; P p1(std::unique_ptr(new int(3)), 4); @@ -56,41 +28,5 @@ int main() assert(*p2.first == 3); assert(p2.second == 4); } - { - using P = std::pair; - int x = 42; - int y = 101; - int x2 = -1; - int y2 = 300; - P p1(x, std::move(y)); - P p2(x2, std::move(y2)); - p1 = std::move(p2); - assert(p1.first == x2); - assert(p1.second == y2); - } - { - using P = std::pair; - static_assert(!std::is_move_assignable

::value, ""); - } - { - // The move decays to the copy constructor - CountAssign::reset(); - using P = std::pair; - static_assert(std::is_move_assignable

::value, ""); - P p; - P p2; - p = std::move(p2); - assert(CountAssign::moved == 0); - assert(CountAssign::copied == 1); - } - { - CountAssign::reset(); - using P = std::pair; - static_assert(std::is_move_assignable

::value, ""); - P p; - P p2; - p = std::move(p2); - assert(CountAssign::moved == 1); - assert(CountAssign::copied == 0); - } +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -- 2.7.4