diff --git a/libcxx/test/std/containers/views/span.sub/subspan.pass.cpp b/libcxx/test/std/containers/views/span.sub/subspan.pass.cpp --- a/libcxx/test/std/containers/views/span.sub/subspan.pass.cpp +++ b/libcxx/test/std/containers/views/span.sub/subspan.pass.cpp @@ -37,13 +37,7 @@ using S2 = decltype(s2); ASSERT_SAME_TYPE(typename Span::value_type, typename S1::value_type); ASSERT_SAME_TYPE(typename Span::value_type, typename S2::value_type); - if constexpr (Count != std::dynamic_extent) { - static_assert(S1::extent == Count); - } else if constexpr (Span::extent != std::dynamic_extent) { - static_assert(S1::extent == Span::extent - Offset); - } else { - static_assert(S1::extent == std::dynamic_extent); - } + static_assert(S1::extent == Count); static_assert(S2::extent == std::dynamic_extent, ""); return s1.data() == s2.data() @@ -82,13 +76,7 @@ using S2 = decltype(s2); ASSERT_SAME_TYPE(typename Span::value_type, typename S1::value_type); ASSERT_SAME_TYPE(typename Span::value_type, typename S2::value_type); - if constexpr (Count != std::dynamic_extent) { - static_assert(S1::extent == Count); - } else if constexpr (Span::extent != std::dynamic_extent) { - static_assert(S1::extent == Span::extent - Offset); - } else { - static_assert(S1::extent == std::dynamic_extent); - } + static_assert(S1::extent == Count); static_assert(S2::extent == std::dynamic_extent, ""); assert(s1.data() == s2.data()); assert(s1.size() == s2.size());