vendor/libc++/libc++-trunk-r338150

4 files changed, 77 insertions, 4 deletions

diff --git a/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
index 049ccfe9871a..dcb09a181e13 100644
--- a/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
+++ b/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
@@ -12,7 +12,7 @@
 // template<ForwardIterator Iter>
 //   requires OutputIterator<Iter, Iter::reference>
 //         && EqualityComparable<Iter::value_type>
-//   Iter
+//   constexpr Iter        // constexpr after C++17
 //   unique(Iter first, Iter last);
 
 #include <algorithm>
@@ -22,6 +22,19 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+          int ia[]       = {0, 1, 1, 3, 4};
+    const int expected[] = {0, 1, 3, 4};
+    const size_t N = 4;
+
+    auto it = std::unique(std::begin(ia), std::end(ia));
+    return it == (std::begin(ia) + N)
+        && std::equal(std::begin(ia), it, std::begin(expected), std::end(expected))
+        ;
+    }
+#endif
+
 template <class Iter>
 void
 test()
@@ -182,4 +195,8 @@ int main()
     test1<random_access_iterator<Ptr*> >();
     test1<Ptr*>();
 #endif
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
index 761dad4ecd05..48ddcf921e49 100644
--- a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -14,14 +14,29 @@
 //         && EqualityComparable<InIter::value_type>
 //         && HasAssign<InIter::value_type, InIter::reference>
 //         && Constructible<InIter::value_type, InIter::reference>
-//   OutIter
+//   constexpr OutIter        // constexpr after C++17
 //   unique_copy(InIter first, InIter last, OutIter result);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+          int ia[]       = {0, 1, 2, 2, 4};
+          int ib[]       = {0, 0, 0, 0, 0};
+    const int expected[] = {0, 1, 2, 4};
+
+    auto it = std::unique_copy(std::begin(ia), std::end(ia), std::begin(ib));
+    return it == (std::begin(ib) + std::size(expected))
+        && *it == 0 // don't overwrite final value in output
+        && std::equal(std::begin(ib), it, std::begin(expected), std::end(expected))
+        ;
+    }
+#endif
+
 template <class InIter, class OutIter>
 void
 test()
@@ -122,4 +137,8 @@ int main()
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
     test<const int*, int*>();
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
index 6819899a1145..55bfd36d5703 100644
--- a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -15,14 +15,30 @@
 //         && HasAssign<InIter::value_type, InIter::reference>
 //         && Constructible<InIter::value_type, InIter::reference>
 //         && CopyConstructible<Pred>
-//   OutIter
+//   constexpr OutIter        // constexpr after C++17
 //   unique_copy(InIter first, InIter last, OutIter result, Pred pred);
 
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+          int ia[]       = {0, 1, 2, 2, 4};
+          int ib[]       = {0, 0, 0, 0, 0};
+    const int expected[] = {0, 1, 2, 4};
+
+    auto it = std::unique_copy(std::begin(ia), std::end(ia), std::begin(ib),
+                         [](int a, int b) {return a == b; });
+    return it == (std::begin(ib) + std::size(expected))
+        && *it == 0 // don't overwrite final value in output
+        && std::equal(std::begin(ib), it, std::begin(expected), std::end(expected))
+        ;
+    }
+#endif
+
 struct count_equal
 {
     static unsigned count;
@@ -149,4 +165,8 @@ int main()
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
     test<const int*, int*>();
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }
diff --git a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
index 1640052058c7..2936a4e66f5c 100644
--- a/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
+++ b/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
@@ -12,7 +12,7 @@
 // template<ForwardIterator Iter, EquivalenceRelation<auto, Iter::value_type> Pred>
 //   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
 //         && CopyConstructible<Pred>
-//   Iter
+//   constexpr Iter        // constexpr after C++17
 //   unique(Iter first, Iter last, Pred pred);
 
 #include <algorithm>
@@ -22,6 +22,19 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
+#if TEST_STD_VER > 17
+TEST_CONSTEXPR bool test_constexpr() {
+          int ia[]       = {0, 1, 1, 3, 4};
+    const int expected[] = {0, 1, 3, 4};
+    const size_t N = 4;
+
+    auto it = std::unique(std::begin(ia), std::end(ia), [](int a, int b) {return a == b; });
+    return it == (std::begin(ia) + N)
+        && std::equal(std::begin(ia), it, std::begin(expected), std::end(expected))
+        ;
+    }
+#endif
+
 struct count_equal
 {
     static unsigned count;
@@ -224,4 +237,8 @@ int main()
     test1<random_access_iterator<Ptr*> >();
     test1<Ptr*>();
 #endif
+
+#if TEST_STD_VER > 17
+    static_assert(test_constexpr());
+#endif
 }