Run constexpr test with unique_ptr only since C++23

Author: winner245

libcxx/test/std/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp

@@ -26,11 +26,11 @@
 struct TestPtr {
   template <class Iter>
   TEST_CONSTEXPR_CXX20 void operator()() {
-    types::for_each(types::forward_iterator_list<int*>(), TestPtrImpl<Iter>());
+    types::for_each(types::forward_iterator_list<int*>(), TestImpl<Iter>());
   }
 
   template <class Iter1>
-  struct TestPtrImpl {
+  struct TestImpl {
     template <class Iter2>
     TEST_CONSTEXPR_CXX20 void operator()() {
       int a[] = {1, 2, 3};
@@ -46,12 +46,12 @@ struct TestPtr {
 #if TEST_STD_VER >= 11
 struct TestUniquePtr {
   template <class Iter>
-  TEST_CONSTEXPR_CXX20 void operator()() {
-    types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtrImpl<Iter>());
+  TEST_CONSTEXPR_CXX23 void operator()() {
+    types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestImpl<Iter>());
   }
 
   template <class Iter1>
-  struct TestUniquePtrImpl {
+  struct TestImpl {
     template <class Iter2>
     TEST_CONSTEXPR_CXX23 void operator()() {
       std::unique_ptr<int> a[3];
@@ -67,6 +67,12 @@ struct TestUniquePtr {
     }
   };
 };
+
+// This test is constexpr only since C++23 because constexpr std::unique_ptr is only available since C++23
+TEST_CONSTEXPR_CXX23 bool test_unique_ptr() {
+  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
+  return true;
+}
 #endif
 
 TEST_CONSTEXPR_CXX20 bool test_simple_cases() {
@@ -95,19 +101,22 @@ TEST_CONSTEXPR_CXX20 bool test_simple_cases() {
   return true;
 }
 
-TEST_CONSTEXPR_CXX20 bool tests() {
+TEST_CONSTEXPR_CXX20 bool test() {
   test_simple_cases();
   types::for_each(types::forward_iterator_list<int*>(), TestPtr());
-#if TEST_STD_VER >= 11
-  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
-#endif
   return true;
 }
 
 int main(int, char**) {
-  tests();
+  test();
+#if TEST_STD_VER >= 11
+  test_unique_ptr();
+#endif
 #if TEST_STD_VER >= 20
-  static_assert(tests());
+  static_assert(test());
+#endif
+#if TEST_STD_VER >= 23
+  static_assert(test_unique_ptr());
 #endif
 
   return 0;

libcxx/test/std/utilities/utility/utility.swap/swap_array.pass.cpp

@@ -51,6 +51,26 @@ constexpr bool can_swap() {
 }
 #endif
 
+#if TEST_STD_VER >= 11
+// This test is constexpr only since C++23 because constexpr std::unique_ptr is only available since C++23
+TEST_CONSTEXPR_CXX23 bool test_unique_ptr() {
+  std::unique_ptr<int> i[3];
+  for (int k = 0; k < 3; ++k)
+    i[k].reset(new int(k + 1));
+  std::unique_ptr<int> j[3];
+  for (int k = 0; k < 3; ++k)
+    j[k].reset(new int(k + 4));
+  std::swap(i, j);
+  assert(*i[0] == 4);
+  assert(*i[1] == 5);
+  assert(*i[2] == 6);
+  assert(*j[0] == 1);
+  assert(*j[1] == 2);
+  assert(*j[2] == 3);
+  return true;
+}
+#endif
+
 TEST_CONSTEXPR_CXX20 bool test() {
   {
     int i[3] = {1, 2, 3};
@@ -107,21 +127,6 @@ TEST_CONSTEXPR_CXX20 bool test() {
     assert(b[2][2] == 8);
   }
 #if TEST_STD_VER >= 11
-  {
-    std::unique_ptr<int> i[3];
-    for (int k = 0; k < 3; ++k)
-      i[k].reset(new int(k + 1));
-    std::unique_ptr<int> j[3];
-    for (int k = 0; k < 3; ++k)
-      j[k].reset(new int(k + 4));
-    std::swap(i, j);
-    assert(*i[0] == 4);
-    assert(*i[1] == 5);
-    assert(*i[2] == 6);
-    assert(*j[0] == 1);
-    assert(*j[1] == 2);
-    assert(*j[2] == 3);
-  }
   {
     using CA = CopyOnly[42];
     using MA = NoexceptMoveOnly[42];
@@ -142,9 +147,15 @@ TEST_CONSTEXPR_CXX20 bool test() {
 
 int main(int, char**) {
   test();
-#if TEST_STD_VER > 17
+#if TEST_STD_VER >= 11
+  test_unique_ptr();
+#endif
+#if TEST_STD_VER >= 20
   static_assert(test());
-#endif // TEST_STD_VER > 17
+#endif
+#if TEST_STD_VER >= 23
+  static_assert(test_unique_ptr());
+#endif
 
   return 0;
 }