STL Hardening

tests/std/tests/P0009R18_mdspan_extents_death/test.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#define _CONTAINER_DEBUG_LEVEL 1
-
 #include <array>
 #include <cstddef>
 #include <mdspan>
@@ -97,6 +95,8 @@ void test_construction_from_array_with_unrepresentable_as_index_type_values() {
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;
+
+#if _ITERATOR_DEBUG_LEVEL != 0
     exec.add_death_tests({
         test_static_extent_function_with_invalid_index,
         test_extent_function_with_invalid_index,
@@ -111,5 +111,7 @@ int main(int argc, char* argv[]) {
         test_construction_from_array_with_invalid_values,
         test_construction_from_array_with_unrepresentable_as_index_type_values,
     });
+#endif // _ITERATOR_DEBUG_LEVEL != 0
+
     return exec.run(argc, argv);
 }

tests/std/tests/P0009R18_mdspan_layout_left_death/test.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#define _CONTAINER_DEBUG_LEVEL 1
-
 #include <array>
 #include <cstddef>
 #include <mdspan>
@@ -41,7 +39,7 @@ void test_construction_from_other_stride_mapping_1() {
     layout_stride::mapping<Ext> m1{Ext{}, array{4, 1}};
     // For all r in the range [0, extents_type::rank()), other.stride(r) must be equal to
     // extents().fwd-prod-of-extents(r)
-    layout_left::mapping<Ext> m2{m1};
+    [[maybe_unused]] layout_left::mapping<Ext> m2{m1};
 }
 
 void test_construction_from_other_stride_mapping_2() {
@@ -67,6 +65,8 @@ void test_stride_function() {
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;
+
+#if _ITERATOR_DEBUG_LEVEL != 0
     exec.add_death_tests({
         test_construction_from_extents_type_with_signed_index_type,
         test_construction_from_extents_type_with_unsigned_index_type,
@@ -77,5 +77,7 @@ int main(int argc, char* argv[]) {
         test_call_operator,
         test_stride_function,
     });
+#endif // _ITERATOR_DEBUG_LEVEL != 0
+
     return exec.run(argc, argv);
 }

tests/std/tests/P0009R18_mdspan_layout_right_death/test.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#define _CONTAINER_DEBUG_LEVEL 1
-
 #include <array>
 #include <cstddef>
 #include <mdspan>
@@ -41,7 +39,7 @@ void test_construction_from_other_stride_mapping_1() {
     layout_stride::mapping<Ext> m1{Ext{}, array{1, 2}};
     // For all r in the range [0, extents_type::rank()), other.stride(r) must be equal to
     // extents().rev-prod-of-extents(r)
-    layout_right::mapping<Ext> m2{m1};
+    [[maybe_unused]] layout_right::mapping<Ext> m2{m1};
 }
 
 void test_construction_from_other_stride_mapping_2() {
@@ -67,6 +65,8 @@ void test_stride_function() {
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;
+
+#if _ITERATOR_DEBUG_LEVEL != 0
     exec.add_death_tests({
         test_construction_from_extents_type_with_signed_index_type,
         test_construction_from_extents_type_with_unsigned_index_type,
@@ -77,5 +77,7 @@ int main(int argc, char* argv[]) {
         test_call_operator,
         test_stride_function,
     });
+#endif // _ITERATOR_DEBUG_LEVEL != 0
+
     return exec.run(argc, argv);
 }

tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#define _CONTAINER_DEBUG_LEVEL 1
-
 #include <array>
 #include <cstddef>
 #include <mdspan>
@@ -69,6 +67,8 @@ void test_stride_with_empty_extents() {
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;
+
+#if _ITERATOR_DEBUG_LEVEL != 0
     exec.add_death_tests({
         test_default_construction,
         test_construction_from_extents_and_array_1,
@@ -79,5 +79,7 @@ int main(int argc, char* argv[]) {
         test_call_operator,
         test_stride_with_empty_extents,
     });
+#endif // _ITERATOR_DEBUG_LEVEL != 0
+
     return exec.run(argc, argv);
 }

tests/std/tests/P0009R18_mdspan_mdspan_death/test.cpp

@@ -57,16 +57,25 @@ void test_size_when_index_type_is_unsigned() {
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;
+
+#if _ITERATOR_DEBUG_LEVEL != 0
     exec.add_death_tests({
-        test_construction_from_other_mdspan,
 #ifdef __cpp_multidimensional_subscript // TRANSITION, P2128R6
-        test_access_with_invalid_multidimensional_index_1,
         test_access_with_nonrepresentable_index_1,
 #endif // __cpp_multidimensional_subscript
-        test_access_with_invalid_multidimensional_index_2,
         test_access_with_nonrepresentable_index_2,
         test_size_when_index_type_is_signed,
         test_size_when_index_type_is_unsigned,
     });
+#endif // _ITERATOR_DEBUG_LEVEL != 0
+
+    exec.add_death_tests({
+        test_construction_from_other_mdspan,
+#ifdef __cpp_multidimensional_subscript // TRANSITION, P2128R6
+        test_access_with_invalid_multidimensional_index_1,
+#endif // __cpp_multidimensional_subscript
+        test_access_with_invalid_multidimensional_index_2,
+    });
+
     return exec.run(argc, argv);
 }