summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-02-21 02:30:41 +0000
committerEric Fiselier <eric@efcs.ca>2015-02-21 02:30:41 +0000
commit65500d4b29bdd03f6e3d14bd09550465bd9e16ed (patch)
treee56ee75938a9c33a4941b2a8d78758ce2f120f91
parentd2852b69ce15da37e62d98ca313febd3664c0f28 (diff)
downloadbcm5719-llvm-65500d4b29bdd03f6e3d14bd09550465bd9e16ed.tar.gz
bcm5719-llvm-65500d4b29bdd03f6e3d14bd09550465bd9e16ed.zip
[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 llvm-svn: 230120
-rw-r--r--libcxx/include/tuple4
-rw-r--r--libcxx/include/type_traits3
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp17
3 files changed, 22 insertions, 2 deletions
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 <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()
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index 52fb5902485..1820bb2e4bc 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -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>
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
index 8578d7fe91d..d282c9c68a4 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
@@ -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
}
OpenPOWER on IntegriCloud