From 65500d4b29bdd03f6e3d14bd09550465bd9e16ed Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 21 Feb 2015 02:30:41 +0000 Subject: [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 template struct IllFormedDefaultImp { IllFormedDefaultImp(T x) : value(x) {} constexpr IllFormedDefaultImp() {} T value; }; typedef IllFormedDefaultImp IllFormedDefault; template struct pair { template ::value && std::is_default_constructible::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 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 llvm-svn: 230120 --- libcxx/include/tuple | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcxx/include/tuple') diff --git a/libcxx/include/tuple b/libcxx/include/tuple index 93518d8bd64..21fa900ddc3 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -511,8 +511,8 @@ class _LIBCPP_TYPE_VIS_ONLY tuple typename tuple_element<_Jp, tuple<_Up...> >::type&& get(tuple<_Up...>&&) _NOEXCEPT; public: - template ::value)...>::value + template , _Dummy>::value...>::value >::type> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR tuple() -- cgit v1.2.3