Revert r289727 due to PR31384
This patch reverts the changes to tuple which fixed construction from
types derived from tuple. It breaks the code mentioned in llvm.org/PR31384.
I'll follow this commit up with a test case.
llvm-svn: 289773
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 347a1cc2212abd771ae9cc2e202ddd78704242cc
diff --git a/include/__tuple b/include/__tuple
index 8e6d2bd..775d734 100644
--- a/include/__tuple
+++ b/include/__tuple
@@ -453,57 +453,19 @@
#endif // _LIBCPP_HAS_NO_VARIADICS
#ifndef _LIBCPP_CXX03_LANG
+template <bool _IsTuple, class _SizeTrait, size_t _Expected>
+struct __tuple_like_with_size_imp : false_type {};
-template <class _Tp, size_t _TSize, bool _Good = true>
-struct __lookup_result {
- using type = _Tp;
- static constexpr bool _Success = _Good;
- static constexpr size_t _Size = _TSize;
-};
-using __lookup_failure = __lookup_result<void, (size_t)-1, false>;
+template <class _SizeTrait, size_t _Expected>
+struct __tuple_like_with_size_imp<true, _SizeTrait, _Expected>
+ : integral_constant<bool, _SizeTrait::value == _Expected> {};
-template <class ..._Args>
-auto __deduce_tuple_type_ovl(tuple<_Args...>&)
- -> __lookup_result<tuple<_Args...>, sizeof...(_Args)>;
-
-template <class _T1, class _T2>
-auto __deduce_tuple_type_ovl(pair<_T1, _T2>&)
- -> __lookup_result<pair<_T1, _T2>, 2>;
-
-template <class _Tp, size_t _Size>
-auto __deduce_tuple_type_ovl(array<_Tp, _Size>&)
- -> __lookup_result<array<_Tp, _Size>, _Size>;
-
-template <class _Tp>
-auto __deduce_tuple_type_imp(int)
- -> decltype(__deduce_tuple_type_ovl(_VSTD::declval<__uncvref_t<_Tp>&>()));
-template <class> __lookup_failure __deduce_tuple_type_imp(...);
-
-// __deduce_tuple_like - Given a type determine if it is, or is derived from,
-// a tuple-like type. This trait is used to support constructing and assigning
-// to std::tuple from user-types derived from a tuple-like type.
-template <class _TupleLike,
- class _Result = decltype(__deduce_tuple_type_imp<_TupleLike>(0)),
- bool _Good = _Result::_Success>
-struct __deduce_tuple_like {
- static_assert(_Good, "incorrect specialization choosen");
- static constexpr bool _Success = true;
- static constexpr size_t _Size = _Result::_Size;
- using _RawType = typename _Result::type;
- using _QualType =
- typename __propagate_value_category<_TupleLike>::template __apply<_RawType>;
-};
-
-template <class _TupleLike, class _Result>
-struct __deduce_tuple_like<_TupleLike, _Result, /*_Good=*/false> {
- static constexpr bool _Success = false;
- static constexpr size_t _Size = (size_t)-1;
-};
-
-template <class _TupleLike, size_t _ExpectedSize,
- class _Deduced = __deduce_tuple_like<_TupleLike>>
-using __tuple_like_with_size = integral_constant<bool,
- _Deduced::_Success && _Deduced::_Size == _ExpectedSize>;
+template <class _Tuple, size_t _ExpectedSize,
+ class _RawTuple = typename __uncvref<_Tuple>::type>
+using __tuple_like_with_size = __tuple_like_with_size_imp<
+ __tuple_like<_RawTuple>::value,
+ tuple_size<_RawTuple>, _ExpectedSize
+ >;
struct _LIBCPP_TYPE_VIS __check_tuple_constructor_fail {
template <class ...>
diff --git a/include/tuple b/include/tuple
index c9146fd..553d8e5 100644
--- a/include/tuple
+++ b/include/tuple
@@ -555,19 +555,13 @@
{
template <class _Tuple>
static constexpr bool __enable_implicit() {
- using _Deduced = __deduce_tuple_like<_Tuple>;
- using _QualType = typename _Deduced::_QualType;
- static_assert(__tuple_like<typename _Deduced::_RawType>::value, "");
- return __tuple_convertible<_QualType, tuple>::value;
+ return __tuple_convertible<_Tuple, tuple>::value;
}
template <class _Tuple>
static constexpr bool __enable_explicit() {
- using _Deduced = __deduce_tuple_like<_Tuple>;
- using _QualType = typename _Deduced::_QualType;
- static_assert(__tuple_like<typename _Deduced::_RawType>::value, "");
- return __tuple_constructible<_QualType, tuple>::value
- && !__tuple_convertible<_QualType, tuple>::value;
+ return __tuple_constructible<_Tuple, tuple>::value
+ && !__tuple_convertible<_Tuple, tuple>::value;
}
};
@@ -820,74 +814,66 @@
_VSTD::forward<_Up>(__u)...) {}
template <class _Tuple,
- class _Deduced = __deduce_tuple_like<_Tuple>,
- class _TupBase = typename _Deduced::_QualType,
typename enable_if
<
_CheckTupleLikeConstructor<
- _Deduced::_Size == sizeof...(_Tp)
- && !_PackExpandsToThisTuple<_TupBase>::value
- >::template __enable_implicit<_TupBase>(),
+ __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+ && !_PackExpandsToThisTuple<_Tuple>::value
+ >::template __enable_implicit<_Tuple>(),
bool
>::type = false
>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
- tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _TupBase>::value))
- : base_(_VSTD::forward<_TupBase>(__t)) {}
+ tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
+ : base_(_VSTD::forward<_Tuple>(__t)) {}
template <class _Tuple,
- class _Deduced = __deduce_tuple_like<_Tuple>,
- class _TupBase = typename _Deduced::_QualType,
typename enable_if
<
_CheckTupleLikeConstructor<
- _Deduced::_Size == sizeof...(_Tp)
- && !_PackExpandsToThisTuple<_TupBase>::value
- >::template __enable_explicit<_TupBase>(),
+ __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+ && !_PackExpandsToThisTuple<_Tuple>::value
+ >::template __enable_explicit<_Tuple>(),
bool
>::type = false
>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
explicit
- tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _TupBase>::value))
- : base_(_VSTD::forward<_TupBase>(__t)) {}
+ tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
+ : base_(_VSTD::forward<_Tuple>(__t)) {}
template <class _Alloc, class _Tuple,
- class _Deduced = __deduce_tuple_like<_Tuple>,
- class _TupBase = typename _Deduced::_QualType,
typename enable_if
<
_CheckTupleLikeConstructor<
- _Deduced::_Size == sizeof...(_Tp)
- >::template __enable_implicit<_TupBase>(),
+ __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+ >::template __enable_implicit<_Tuple>(),
bool
>::type = false
>
_LIBCPP_INLINE_VISIBILITY
tuple(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
- : base_(allocator_arg_t(), __a, _VSTD::forward<_TupBase>(__t)) {}
+ : base_(allocator_arg_t(), __a, _VSTD::forward<_Tuple>(__t)) {}
template <class _Alloc, class _Tuple,
- class _Deduced = __deduce_tuple_like<_Tuple>,
- class _TupBase = typename _Deduced::_QualType,
typename enable_if
<
_CheckTupleLikeConstructor<
- _Deduced::_Size == sizeof...(_Tp)
- >::template __enable_explicit<_TupBase>(),
+ __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+ >::template __enable_explicit<_Tuple>(),
bool
>::type = false
>
_LIBCPP_INLINE_VISIBILITY
explicit
tuple(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
- : base_(allocator_arg_t(), __a, _VSTD::forward<_TupBase>(__t)) {}
+ : base_(allocator_arg_t(), __a, _VSTD::forward<_Tuple>(__t)) {}
using _CanCopyAssign = __all<is_copy_assignable<_Tp>::value...>;
using _CanMoveAssign = __all<is_move_assignable<_Tp>::value...>;
_LIBCPP_INLINE_VISIBILITY
- tuple& operator=(typename conditional<_CanCopyAssign::value, tuple const&, __nat>::type const& __t)
+ tuple& operator=(typename conditional<_CanCopyAssign::value, tuple, __nat>::type const& __t)
_NOEXCEPT_((__all<is_nothrow_copy_assignable<_Tp>::value...>::value))
{
base_.operator=(__t.base_);
@@ -903,19 +889,16 @@
}
template <class _Tuple,
- class _Deduced = __deduce_tuple_like<_Tuple>,
- class _TupBase = typename _Deduced::_QualType,
class = typename enable_if
<
- __tuple_assignable<_TupBase, tuple>::value
+ __tuple_assignable<_Tuple, tuple>::value
>::type
>
_LIBCPP_INLINE_VISIBILITY
tuple&
- operator=(_Tuple&& __t)
- _NOEXCEPT_((is_nothrow_assignable<base&, _TupBase>::value))
+ operator=(_Tuple&& __t) _NOEXCEPT_((is_nothrow_assignable<base&, _Tuple>::value))
{
- base_.operator=(_VSTD::forward<_TupBase>(__t));
+ base_.operator=(_VSTD::forward<_Tuple>(__t));
return *this;
}
diff --git a/include/type_traits b/include/type_traits
index c2b90ea..fbfc9d3 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -4696,65 +4696,6 @@
#endif
-#ifndef _LIBCPP_CXX03_LANG
-
-// __propagate_value_category -- A utility for detecting the value category
-// of a given type and applying that value-category to another type.
-// For example applying the cv-ref quals of a derived type to form the
-// correctly cv-qualified base type.
-template <class _FromType>
-struct __propagate_value_category {
- template <class _ToType> struct __checked_apply {
- static_assert(!is_reference<_ToType>::value, "must be unqualified");
- static_assert(!is_const<_ToType>::value
- && !is_volatile<_ToType>::value, "must be unqualified");
- using type = _ToType;
- };
- template <class _ToType>
- using __apply = typename __checked_apply<_ToType>::type;
-};
-
-template <class _FromType>
-struct __propagate_value_category<_FromType&> {
- template <class _ToType>
- using __apply = typename add_lvalue_reference<
- typename __propagate_value_category<_FromType>::template __apply<_ToType>
- >::type;
-};
-
-template <class _FromType>
-struct __propagate_value_category<_FromType&&> {
- template <class _ToType>
- using __apply = typename add_rvalue_reference<
- typename __propagate_value_category<_FromType>::template __apply<_ToType>
- >::type;
-};
-
-template <class _FromType>
-struct __propagate_value_category<_FromType const> {
- template <class _ToType>
- using __apply = typename add_const<
- typename __propagate_value_category<_FromType>::template __apply<_ToType>
- >::type;
-};
-
-template <class _FromType>
-struct __propagate_value_category<_FromType volatile> {
- template <class _ToType>
- using __apply = typename add_volatile<
- typename __propagate_value_category<_FromType>::template __apply<_ToType>
- >::type;
-};
-
-template <class _FromType>
-struct __propagate_value_category<_FromType const volatile> {
- template <class _ToType>
- using __apply = typename add_cv<
- typename __propagate_value_category<_FromType>::template __apply<_ToType>
- >::type;
-};
-#endif
-
_LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_TYPE_TRAITS