Replace built-in array by std::array in the test

winner245 · winner245 · commit d59fc211d6f3 · 2025-01-29T16:34:48.000-05:00
diff --git a/libcxx/test/benchmarks/containers/ContainerBenchmarks.h b/libcxx/test/benchmarks/containers/ContainerBenchmarks.h
@@ -44,7 +44,7 @@ void BM_CopyConstruct_Alloc(benchmark::State& st, Container, Allocator a) {
   auto size = st.range(0);
   Container c(size);
   for (auto _ : st) {
-    Container v(c, a);
+    Container v(c, a); // we assume the destructor doesn't dominate the benchmark
     DoNotOptimizeData(v);
   }
 }
diff --git a/libcxx/test/std/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/copy.pass.cpp
@@ -11,6 +11,7 @@
 
 // vector(const vector& v);
 
+#include <array>
 #include <cassert>
 #include <memory>
 #include <vector>
@@ -31,46 +32,46 @@ TEST_CONSTEXPR_CXX20 void test(const std::vector<bool, A>& x) {
 }
 
 TEST_CONSTEXPR_CXX20 bool tests() {
-  bool a05[5]  = {1, 0, 1, 0, 1};
-  bool a17[17] = {0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1};
-  bool a33[33] = {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1};
-  bool a65[65] = {0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0};
+  std::array<int, 5> a1  = {1, 0, 1, 0, 1};
+  std::array<int, 17> a2 = {0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1};
+  std::array<int, 33> a3 = {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1};
+  std::array<int, 65> a4 = {0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0};
 
   { // Test the copy constructor with the default allocator
-    test(std::vector<bool>(a05, a05 + sizeof(a05) / sizeof(a05[0])));
-    test(std::vector<bool>(a17, a17 + sizeof(a17) / sizeof(a17[0])));
-    test(std::vector<bool>(a33, a33 + sizeof(a33) / sizeof(a33[0])));
-    test(std::vector<bool>(a65, a65 + sizeof(a65) / sizeof(a65[0])));
+    test(std::vector<bool>(a1.begin(), a1.end()));
+    test(std::vector<bool>(a2.begin(), a2.end()));
+    test(std::vector<bool>(a3.begin(), a3.end()));
+    test(std::vector<bool>(a4.begin(), a4.end()));
     test(std::vector<bool>(257, true));
   }
 
   { // Test the copy constructor with test_allocator
     using A = test_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A(5)));
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A(5)));
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A(5)));
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A(5)));
+    test(C(a1.begin(), a1.end()));
+    test(C(a2.begin(), a2.end()));
+    test(C(a3.begin(), a3.end()));
+    test(C(a4.begin(), a4.end()));
     test(C(257, true, A(5)));
   }
 
   { // Test the copy constructor with other_allocator
     using A = other_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A(5)));
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A(5)));
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A(5)));
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A(5)));
+    test(C(a1.begin(), a1.end()));
+    test(C(a2.begin(), a2.end()));
+    test(C(a3.begin(), a3.end()));
+    test(C(a4.begin(), a4.end()));
     test(C(257, true, A(5)));
   }
 
   { // Test the copy constructor with min_allocator
     using A = min_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A()));
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A()));
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A()));
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A()));
+    test(C(a1.begin(), a1.end()));
+    test(C(a2.begin(), a2.end()));
+    test(C(a3.begin(), a3.end()));
+    test(C(a4.begin(), a4.end()));
     test(C(257, true, A()));
   }
 
diff --git a/libcxx/test/std/containers/sequences/vector.bool/copy_alloc.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/copy_alloc.pass.cpp
@@ -11,6 +11,7 @@
 
 // vector(const vector& v, const allocator_type& a);
 
+#include <array>
 #include <cassert>
 #include <vector>
 
@@ -28,46 +29,46 @@ TEST_CONSTEXPR_CXX20 void test(const std::vector<bool, A>& x, const A& a) {
 }
 
 TEST_CONSTEXPR_CXX20 bool tests() {
-  bool a05[5]  = {1, 0, 1, 0, 1};
-  bool a17[17] = {0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1};
-  bool a33[33] = {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1};
-  bool a65[65] = {0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0};
+  std::array<int, 5> a1  = {1, 0, 1, 0, 1};
+  std::array<int, 17> a2 = {0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1};
+  std::array<int, 33> a3 = {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1};
+  std::array<int, 65> a4 = {0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0};
 
   { // Test with the default allocator
-    test(std::vector<bool>(a05, a05 + sizeof(a05) / sizeof(a05[0])), std::allocator<bool>());
-    test(std::vector<bool>(a17, a17 + sizeof(a17) / sizeof(a17[0])), std::allocator<bool>());
-    test(std::vector<bool>(a33, a33 + sizeof(a33) / sizeof(a33[0])), std::allocator<bool>());
-    test(std::vector<bool>(a65, a65 + sizeof(a65) / sizeof(a65[0])), std::allocator<bool>());
+    test(std::vector<bool>(a1.begin(), a1.end()), std::allocator<bool>());
+    test(std::vector<bool>(a2.begin(), a2.end()), std::allocator<bool>());
+    test(std::vector<bool>(a3.begin(), a3.end()), std::allocator<bool>());
+    test(std::vector<bool>(a4.begin(), a4.end()), std::allocator<bool>());
     test(std::vector<bool>(257, true), std::allocator<bool>());
   }
 
   { // Test with test_allocator
     using A = test_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A(5)), A(3));
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A(5)), A(3));
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A(5)), A(3));
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A(5)), A(3));
+    test(C(a1.begin(), a1.end(), A(5)), A(3));
+    test(C(a2.begin(), a2.end(), A(5)), A(3));
+    test(C(a3.begin(), a3.end(), A(5)), A(3));
+    test(C(a4.begin(), a4.end(), A(5)), A(3));
     test(C(257, true, A(5)), A(3));
   }
 
   { // Test with other_allocator
     using A = other_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A(5)), A(3));
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A(5)), A(3));
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A(5)), A(3));
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A(5)), A(3));
+    test(C(a1.begin(), a1.end(), A(5)), A(3));
+    test(C(a2.begin(), a2.end(), A(5)), A(3));
+    test(C(a3.begin(), a3.end(), A(5)), A(3));
+    test(C(a4.begin(), a4.end(), A(5)), A(3));
     test(C(257, true, A(5)), A(3));
   }
 
   { // Test with min_allocator
     using A = min_allocator<bool>;
     using C = std::vector<bool, A>;
-    test(C(a05, a05 + sizeof(a05) / sizeof(a05[0]), A()), A());
-    test(C(a17, a17 + sizeof(a17) / sizeof(a17[0]), A()), A());
-    test(C(a33, a33 + sizeof(a33) / sizeof(a33[0]), A()), A());
-    test(C(a65, a65 + sizeof(a65) / sizeof(a65[0]), A()), A());
+    test(C(a1.begin(), a1.end(), A()), A());
+    test(C(a2.begin(), a2.end(), A()), A());
+    test(C(a3.begin(), a3.end(), A()), A());
+    test(C(a4.begin(), a4.end(), A()), A());
     test(C(257, true, A()), A());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ void BM_CopyConstruct_Alloc(benchmark::State& st, Container, Allocator a) {`
`44`	`44`	`auto size = st.range(0);`
`45`	`45`	`Container c(size);`
`46`	`46`	`for (auto _ : st) {`
`47`		`- Container v(c, a);`
	`47`	`+ Container v(c, a); // we assume the destructor doesn't dominate the benchmark`
`48`	`48`	`DoNotOptimizeData(v);`
`49`	`49`	`}`
`50`	`50`	`}`