Modify all tests to have TEST_CONSTEXPR_CXX26 and without

Author: vinay-deshmukh

libcxx/test/std/containers/associative/map/compare.pass.cpp

@@ -10,7 +10,7 @@
 
 // template <class Key, class T, class Compare = less<Key>,
 //           class Allocator = allocator<pair<const Key, T>>>
-// class map
+// class map // constexpr since C++26
 
 // https://llvm.org/PR16538
 // https://llvm.org/PR16549
@@ -27,7 +27,7 @@ struct Key {
   bool operator<(const Key&) const { return false; }
 };
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   typedef std::map<Key, int> MapT;
   typedef MapT::iterator Iter;
   typedef std::pair<Iter, bool> IterBool;
@@ -50,6 +50,13 @@ int main(int, char**) {
     assert(!result2.second);
     assert(map[Key(0)] == 42);
   }
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/get_allocator.pass.cpp

@@ -10,7 +10,7 @@
 
 // class map
 
-// allocator_type get_allocator() const
+// allocator_type get_allocator() const // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -19,7 +19,7 @@
 #include "test_allocator.h"
 #include "test_macros.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   typedef std::pair<const int, std::string> ValueType;
   {
     std::allocator<ValueType> alloc;
@@ -31,6 +31,13 @@ int main(int, char**) {
     const std::map<int, std::string, std::less<int>, other_allocator<ValueType> > m(alloc);
     assert(m.get_allocator() == alloc);
   }
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// <map>
+// <map> // constexpr since C++26
 
 // Check that std::map and its iterators can be instantiated with an incomplete
 // type.
@@ -25,8 +25,15 @@ struct A {
 
 inline bool operator==(A const& L, A const& R) { return &L == &R; }
 inline bool operator<(A const& L, A const& R) { return L.data < R.data; }
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   A a;
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/copy.pass.cpp

@@ -10,7 +10,7 @@
 
 // class map
 
-// map(const map& m);
+// map(const map& m); // constexpr since C++26
 
 #include <map>
 #include <cassert>
@@ -20,7 +20,7 @@
 #include "test_allocator.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   {
     typedef std::pair<const int, double> V;
     V ar[] = {
@@ -122,6 +122,13 @@ int main(int, char**) {
     assert(*std::next(mo.begin(), 2) == V(3, 1));
   }
 #endif
+  return true;
+}
 
+int main(int, char**) {
+  assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp

@@ -10,7 +10,7 @@
 
 // class map
 
-// map& operator=(const map& m);
+// map& operator=(const map& m); // constexpr since C++26
 
 #include <map>
 #include <algorithm>
@@ -131,7 +131,7 @@ bool balanced_allocs() {
 }
 #endif
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   {
     typedef std::pair<const int, double> V;
     V ar[] = {V(1, 1), V(1, 1.5), V(1, 2), V(2, 1), V(2, 1.5), V(2, 2), V(3, 1), V(3, 1.5), V(3, 2)};
@@ -292,6 +292,13 @@ int main(int, char**) {
   }
   assert(balanced_allocs());
 #endif
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/deduct.pass.cpp

@@ -33,7 +33,7 @@
 // template<ranges::input_range R, class Allocator>
 //   map(from_range_t, R&&, Allocator)
 //     -> map<range-key-type<R>, range-mapped-type<R>, less<range-key-type<R>>, Allocator>; // C++23
-
+ // constexpr since C++26
 #include <algorithm> // std::equal
 #include <array>
 #include <cassert>
@@ -48,7 +48,7 @@
 using P  = std::pair<int, long>;
 using PC = std::pair<const int, long>;
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   {
     const P arr[] = {{1, 1L}, {2, 2L}, {1, 1L}, {INT_MAX, 1L}, {3, 1L}};
     std::map m(std::begin(arr), std::end(arr));
@@ -192,6 +192,13 @@ int main(int, char**) {
 #endif
 
   AssociativeContainerDeductionGuidesSfinaeAway<std::map, std::map<int, long>>();
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/deduct_const.pass.cpp

@@ -24,7 +24,7 @@
 // template<class Key, class Allocator>
 // map(initializer_list<Key>, Allocator)
 //   -> map<Key, less<Key>, Allocator>;
-
+ // constexpr since C++26
 #include <algorithm> // std::equal
 #include <cassert>
 #include <climits> // INT_MAX
@@ -39,7 +39,7 @@ using P   = std::pair<int, long>;
 using PC  = std::pair<const int, long>;
 using PCC = std::pair<const int, const long>;
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   {
     const PCC arr[] = {{1, 1L}, {2, 2L}, {1, 1L}, {INT_MAX, 1L}, {3, 1L}};
     std::map m(std::begin(arr), std::end(arr));
@@ -102,6 +102,13 @@ int main(int, char**) {
     assert(std::equal(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));
     assert(m.get_allocator().get_id() == 45);
   }
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp

@@ -10,15 +10,15 @@
 
 // class map
 
-// map();
+// map(); // constexpr since C++26
 
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   {
     std::map<int, double> m;
     assert(m.empty());
@@ -50,6 +50,13 @@ int main(int, char**) {
     assert(m.begin() == m.end());
   }
 #endif
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp

@@ -12,7 +12,7 @@
 //    noexcept(
 //        is_nothrow_default_constructible<allocator_type>::value &&
 //        is_nothrow_default_constructible<key_compare>::value &&
-//        is_nothrow_copy_constructible<key_compare>::value);
+//        is_nothrow_copy_constructible<key_compare>::value); // constexpr since C++26
 
 // This tests a conforming extension
 
@@ -32,7 +32,7 @@ struct some_comp {
   bool operator()(const T&, const T&) const { return false; }
 };
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   typedef std::pair<const MoveOnly, MoveOnly> V;
 #if defined(_LIBCPP_VERSION)
   {
@@ -52,6 +52,13 @@ int main(int, char**) {
     typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
     static_assert(!std::is_nothrow_default_constructible<C>::value, "");
   }
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp

@@ -8,7 +8,7 @@
 
 // <map>
 
-// ~map() // implied noexcept;
+// ~map() // implied noexcept; // constexpr since C++26
 
 // UNSUPPORTED: c++03
 
@@ -26,7 +26,7 @@ struct some_comp {
   bool operator()(const T&, const T&) const noexcept { return false; }
 };
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   typedef std::pair<const MoveOnly, MoveOnly> V;
   {
     typedef std::map<MoveOnly, MoveOnly> C;
@@ -46,6 +46,13 @@ int main(int, char**) {
     static_assert(!std::is_nothrow_destructible<C>::value, "");
   }
 #endif // _LIBCPP_VERSION
+return true;
+}
 
+int main(int, char**) {
+assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
   return 0;
 }