<mdspan>: Remove some C28020 warning suppressions (#3690)

Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>
microsoft · May 11, 2023 · 4bd089b · 4bd089b
1 parent 1d70c09
commit 4bd089b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 24 deletions.
diff --git a/stl/inc/mdspan b/stl/inc/mdspan
@@ -146,8 +146,6 @@ public:
               && (is_nothrow_constructible_v<index_type, _OtherIndexTypes> && ...)
               && (sizeof...(_OtherIndexTypes) == rank_dynamic() || sizeof...(_OtherIndexTypes) == rank())
     constexpr explicit extents(_OtherIndexTypes... _Exts) noexcept {
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
         if constexpr ((_Is_standard_integer<_OtherIndexTypes> && ...)) {
             _STL_VERIFY(sizeof...(_Exts) == 0 || ((_Exts >= 0 && _STD in_range<index_type>(_Exts)) && ...),
                 "Either sizeof...(exts) must be equal to 0 or each element of exts must be nonnegative and must be "
@@ -170,7 +168,6 @@ public:
                 }
             }
         }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
     }
 
     template <class _OtherIndexType, size_t _Size, size_t... _Indices>
@@ -594,8 +591,6 @@ public:
         "If Extents::rank_dynamic() == 0 is true, then the size of the multidimensional index space Extents() must be "
         "representable as a value of type typename Extents::index_type (N4944 [mdspan.layout.stride.overview]/4).");
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
     constexpr mapping() noexcept : _Exts(extents_type{}) {
         if constexpr (extents_type::rank() != 0) {
             _Strides.back() = 1;
@@ -605,7 +600,6 @@ public:
             }
         }
     }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
     constexpr mapping(const mapping&) noexcept = default;
 
@@ -682,8 +676,6 @@ public:
         return _Strides;
     }
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
     _NODISCARD constexpr index_type required_span_size() const noexcept {
         if constexpr (extents_type::rank() == 0) {
             return 1;
@@ -701,7 +693,6 @@ public:
             return _Result;
         }
     }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
     template <class... _IndexTypes>
         requires (sizeof...(_IndexTypes) == extents_type::rank()) && (is_convertible_v<_IndexTypes, index_type> && ...)

diff --git a/tests/std/tests/P0009R18_mdspan_layout_left/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_left/test.cpp
@@ -75,14 +75,15 @@ constexpr void check_members(const extents<IndexType, Extents...>& ext, index_se
         // Other tests are defined in 'check_construction_from_other_right_mapping' function
     }
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
     { // Check construction from layout_stride::mapping
         array<IndexType, Ext::rank()> strides{};
         if constexpr (Ext::rank() > 0) {
             strides.front() = 1;
             for (size_t i = 1; i < Ext::rank(); ++i) {
+#pragma warning(push)
+#pragma warning(disable : 28020) // TRANSITION, DevCom-923103
                 strides[i] = static_cast<IndexType>(strides[i - 1] * ext.extent(i - 1));
+#pragma warning(pop)
             }
         }
 
@@ -91,7 +92,6 @@ constexpr void check_members(const extents<IndexType, Extents...>& ext, index_se
         [[maybe_unused]] Mapping m{stride_mapping};
         // Other tests are defined in 'check_construction_from_other_stride_mapping' function
     }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
     Mapping m{ext}; // For later use
 

diff --git a/tests/std/tests/P0009R18_mdspan_layout_left_death/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_left_death/test.cpp
@@ -24,8 +24,6 @@ void test_construction_from_other_right_mapping() {
     layout_left::mapping<dextents<unsigned char, 1>> m2{m1};
 }
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
 void test_construction_from_other_stride_mapping_1() {
     using Ext = extents<int, 2, 4>;
     layout_stride::mapping<Ext> m1{Ext{}, array{1, 1}};
@@ -39,7 +37,6 @@ void test_construction_from_other_stride_mapping_2() {
     // Value of other.required_span_size() must be representable as a value of type index_type
     layout_left::mapping<dextents<unsigned char, 1>> m2{m1};
 }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
 void test_stride_function() {
     layout_left::mapping<extents<int, 3>> m;

diff --git a/tests/std/tests/P0009R18_mdspan_layout_right_death/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_right_death/test.cpp
@@ -24,8 +24,6 @@ void test_construction_from_other_left_mapping() {
     layout_right::mapping<dextents<unsigned char, 1>> m2{m1};
 }
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
 void test_construction_from_other_stride_mapping_1() {
     using Ext = extents<int, 2, 4>;
     layout_stride::mapping<Ext> m1{Ext{}, array{3, 1}};
@@ -39,7 +37,6 @@ void test_construction_from_other_stride_mapping_2() {
     // Value of other.required_span_size() must be representable as a value of type index_type
     layout_right::mapping<dextents<unsigned char, 1>> m2{m1};
 }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
 void test_stride_function() {
     layout_right::mapping<extents<int, 3>> m;

diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp
@@ -43,8 +43,6 @@ constexpr void do_check_members(const extents<IndexType, Extents...>& ext,
     static_assert(same_as<typename Mapping::rank_type, typename Ext::rank_type>);
     static_assert(same_as<typename Mapping::layout_type, layout_stride>);
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
     { // Check default and copy constructor
         Mapping m;
         const Mapping cpy = m;
@@ -127,7 +125,10 @@ constexpr void do_check_members(const extents<IndexType, Extents...>& ext,
     { // Check 'stride' function
         for (size_t i = 0; i < strs.size(); ++i) {
             same_as<IndexType> decltype(auto) s = m.stride(i);
+#pragma warning(push)
+#pragma warning(disable : 28020) // TRANSITION, DevCom-923103
             assert(cmp_equal(strs[i], s));
+#pragma warning(pop)
         }
     }
 
@@ -136,7 +137,6 @@ constexpr void do_check_members(const extents<IndexType, Extents...>& ext,
         assert(!(m != m));
         // Other tests are defined in 'check_comparisons' function [FIXME]
     }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 }
 
 template <class StridesIndexType, class IndexType, size_t... Extents>

diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp
@@ -10,8 +10,6 @@
 
 using namespace std;
 
-#pragma warning(push) // TRANSITION, "/analyze:only" BUG?
-#pragma warning(disable : 28020) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call
 void test_construction_from_extents_and_array() {
     // Value of s[i] must be greater than 0 for all i in the range [0, rank_)
     [[maybe_unused]] layout_stride::mapping<dextents<int, 1>> m1{extents<int, 1>{}, array<int, 1>{-1}};
@@ -28,7 +26,6 @@ void test_construction_from_strided_layout_mapping() {
     // Value of other.required_span_size() must be representable as a value of type index_type
     [[maybe_unused]] layout_stride::mapping<dextents<unsigned char, 1>> m2{m1};
 }
-#pragma warning(pop) // TRANSITION, "/analyze:only" BUG?
 
 int main(int argc, char* argv[]) {
     std_testing::death_test_executive exec;