mirror of
https://github.com/darlinghq/darling-libcxx.git
synced 2025-03-02 08:46:22 +00:00
[libc++] Try and prevent evaluation of is_default_constructible
on tuples default constructor if it is not needed.
Summary: Currently parts of the SFINAE on tuples default constructor always gets evaluated even when the default constructor is never called or instantiated. This can cause a hard compile error when a tuple is created with types that do not have a default constructor. Below is a self contained example using a pair like class. This code will not compile but probably should. ``` #include <type_traits> template <class T> struct IllFormedDefaultImp { IllFormedDefaultImp(T x) : value(x) {} constexpr IllFormedDefaultImp() {} T value; }; typedef IllFormedDefaultImp<int &> IllFormedDefault; template <class T, class U> struct pair { template <bool Dummy = true, class = typename std::enable_if< std::is_default_constructible<T>::value && std::is_default_constructible<U>::value && Dummy>::type > constexpr pair() : first(), second() {} pair(T const & t, U const & u) : first(t), second(u) {} T first; U second; }; int main() { int x = 1; IllFormedDefault v(x); pair<IllFormedDefault, IllFormedDefault> p(v, v); } ``` One way to fix this is to use `Dummy` in a more involved way in the constructor SFINAE. The following patch fixes these sorts of hard compile errors for tuple. Reviewers: mclow.lists, rsmith, K-ballo, EricWF Reviewed By: EricWF Subscribers: ldionne, cfe-commits Differential Revision: http://reviews.llvm.org/D7569 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@230120 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
45969ecfcd
commit
da1818a08c
@ -511,8 +511,8 @@ class _LIBCPP_TYPE_VIS_ONLY tuple
|
||||
typename tuple_element<_Jp, tuple<_Up...> >::type&& get(tuple<_Up...>&&) _NOEXCEPT;
|
||||
public:
|
||||
|
||||
template <bool _Dummy = true, class _Up = typename enable_if<
|
||||
__all<(_Dummy && is_default_constructible<_Tp>::value)...>::value
|
||||
template <bool _Dummy = true, class = typename enable_if<
|
||||
__all<__dependent_type<is_default_constructible<_Tp>, _Dummy>::value...>::value
|
||||
>::type>
|
||||
_LIBCPP_INLINE_VISIBILITY
|
||||
_LIBCPP_CONSTEXPR tuple()
|
||||
|
@ -216,6 +216,9 @@ template <class...>
|
||||
struct __void_t { typedef void type; };
|
||||
#endif
|
||||
|
||||
template <class _Tp, bool>
|
||||
struct _LIBCPP_TYPE_VIS_ONLY __dependent_type : public _Tp {};
|
||||
|
||||
template <bool _Bp, class _If, class _Then>
|
||||
struct _LIBCPP_TYPE_VIS_ONLY conditional {typedef _If type;};
|
||||
template <class _If, class _Then>
|
||||
|
@ -35,6 +35,16 @@ struct ThrowingDefault {
|
||||
ThrowingDefault() { }
|
||||
};
|
||||
|
||||
struct IllFormedDefault {
|
||||
IllFormedDefault(int x) : value(x) {}
|
||||
template <bool Pred = false>
|
||||
constexpr IllFormedDefault() {
|
||||
static_assert(Pred,
|
||||
"The default constructor should not be instantiated");
|
||||
}
|
||||
int value;
|
||||
};
|
||||
|
||||
int main()
|
||||
{
|
||||
{
|
||||
@ -89,5 +99,12 @@ int main()
|
||||
assert(std::get<0>(t) == 0);
|
||||
assert(std::get<1>(t) == nullptr);
|
||||
}
|
||||
{
|
||||
// Check that the SFINAE on the default constructor is not evaluted when
|
||||
// it isn't needed. If the default constructor is evaluted then this test
|
||||
// should fail to compile.
|
||||
IllFormedDefault v(0);
|
||||
std::tuple<IllFormedDefault> t(v);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user