Organize constexpr tests for unique_ptr in a better way

Author: winner245

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

@@ -124,13 +124,10 @@ TEST_CONSTEXPR_CXX20 bool test() {
 
   types::for_each(types::forward_iterator_list<int*>(), TestPtr());
 
-#if TEST_STD_VER >= 11 && TEST_STD_VER <= 17
-  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
-#elif TEST_STD_VER == 20
-  if (!std::is_constant_evaluated())
+#if TEST_STD_VER >= 11
+  // We can't test unique_ptr in constant evaluation before C++23 as it's constexpr only since C++23.
+  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 23)
     types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
-#elif TEST_STD_VER >= 23
-  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
 #endif
 
   return true;

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

@@ -51,26 +51,6 @@ 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};
@@ -140,22 +120,33 @@ TEST_CONSTEXPR_CXX20 bool test() {
     static_assert(!noexcept(std::swap(ca, ca)), "");
     static_assert(noexcept(std::swap(ma, ma)), "");
   }
+
+  // We can't test unique_ptr in constant evaluation before C++23 as it's constexpr only since C++23.
+  if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 23) {
+    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);
+  }
 #endif
 
   return true;
 }
 
 int main(int, char**) {
   test();
-#if TEST_STD_VER >= 11
-  test_unique_ptr();
-#endif
 #if TEST_STD_VER >= 20
   static_assert(test());
 #endif
-#if TEST_STD_VER >= 23
-  static_assert(test_unique_ptr());
-#endif
 
   return 0;
 }