From a1857e2ce35e749e16d092305f53c0f2bf2e9c7b Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 7 Jan 2020 23:33:52 -0800 Subject: [libcxx][test] Fix span tests. span.cons/container.pass.cpp N4842 22.7.3.2 [span.cons]/13 constrains span's range constructor for ranges::contiguous_range (among other criteria). 24.4.5 [range.refinements]/2 says that contiguous_range requires data(), and (via contiguous_range, random_access_range, bidirectional_range, forward_range, input_range, range) it also requires begin() and end() (see 24.4.2 [range.range]/1). Therefore, IsAContainer needs to provide begin() and end(). (Detected by MSVC's concept-constrained implementation.) span.cons/stdarray.pass.cpp This test uses std::array, so it must include . isn't guaranteed to drag in . (Detected by MSVC's implementation which uses a forward declaration to avoid dragging in , for increased compiler throughput.) span.objectrep/as_bytes.pass.cpp span.objectrep/as_writable_bytes.pass.cpp Testing `sp.extent == std::dynamic_extent` triggers MSVC warning C4127 "conditional expression is constant". Using `if constexpr` is a simple way to avoid this without disrupting anyone else (as span requires C++20 mode). span.tuple/get.pass.cpp 22.7.3.2 [span.cons]/4.3: "Preconditions: If extent is not equal to dynamic_extent, then count is equal to extent." These lines were triggering undefined behavior (detected by assertions in MSVC's implementation). I changed the count arguments in the first two chunks, followed by changing the span extents, in order to preserve the test's coverage and follow the existing pattern. span.cons/span.pass.cpp 22.7.3.2 [span.cons]/18.1 constrains span's converting constructor with "Extent == dynamic_extent || Extent == OtherExtent is true". This means that converting from dynamic extent to static extent is not allowed. (Other constructors tested elsewhere, like span(It first, size_type count), can be used to write such code.) As this is the test for the converting constructor, I have: * Removed the "dynamic -> static" case from checkCV(), which is comprehensive. * Changed the initialization of std::span s1{}; in testConstexprSpan() and testRuntimeSpan(), because s1 is used below. * Removed ASSERT_NOEXCEPT(std::span{s0}); from those functions, as they are otherwise comprehensive. * Deleted testConversionSpan() entirely. Note that this could never compile (it had a bool return type, but forgot to say `return`). And it couldn't have provided useful coverage, as the /18.2 constraint "OtherElementType(*)[] is convertible to ElementType(*)[]" permits only cv-qualifications, which are already tested by checkCV(). --- .../containers/views/span.cons/container.pass.cpp | 4 +++ .../std/containers/views/span.cons/span.pass.cpp | 30 +++------------------- .../containers/views/span.cons/stdarray.pass.cpp | 1 + .../views/span.objectrep/as_bytes.pass.cpp | 2 +- .../span.objectrep/as_writable_bytes.pass.cpp | 2 +- .../std/containers/views/span.tuple/get.pass.cpp | 18 ++++++------- 6 files changed, 19 insertions(+), 38 deletions(-) (limited to 'libcxx/test/std') diff --git a/libcxx/test/std/containers/views/span.cons/container.pass.cpp b/libcxx/test/std/containers/views/span.cons/container.pass.cpp index d42013bd268..d4758c694ee 100644 --- a/libcxx/test/std/containers/views/span.cons/container.pass.cpp +++ b/libcxx/test/std/containers/views/span.cons/container.pass.cpp @@ -39,6 +39,10 @@ struct IsAContainer { constexpr size_t size() const {return 1;} constexpr T *data() {return &v_;} constexpr const T *data() const {return &v_;} + constexpr T *begin() {return &v_;} + constexpr const T *begin() const {return &v_;} + constexpr T *end() {return &v_ + 1;} + constexpr const T *end() const {return &v_ + 1;} constexpr T const *getV() const {return &v_;} // for checking T v_; diff --git a/libcxx/test/std/containers/views/span.cons/span.pass.cpp b/libcxx/test/std/containers/views/span.cons/span.pass.cpp index 62f8b9da11b..4ec80efc808 100644 --- a/libcxx/test/std/containers/views/span.cons/span.pass.cpp +++ b/libcxx/test/std/containers/views/span.cons/span.pass.cpp @@ -63,14 +63,7 @@ void checkCV() assert(s1.size() + s2.size() + s3.size() + s4.size() == 0); } -// dynamic -> static - { - std::span s1{ sp}; // a span pointing at int. - std::span< volatile int, 0> s2{ sp}; // a span< volatile int> pointing at int. - std::span s3{ sp}; // a span pointing at int. - std::span s4{ vsp}; // a span pointing at volatile int. - assert(s1.size() + s2.size() + s3.size() + s4.size() == 0); - } +// dynamic -> static (not allowed) } @@ -78,12 +71,11 @@ template constexpr bool testConstexprSpan() { std::span s0{}; - std::span s1(s0); // dynamic -> static + std::span s1{}; std::span s2(s1); // static -> dynamic ASSERT_NOEXCEPT(std::span {s0}); ASSERT_NOEXCEPT(std::span{s1}); ASSERT_NOEXCEPT(std::span {s1}); - ASSERT_NOEXCEPT(std::span{s0}); return s1.data() == nullptr && s1.size() == 0 @@ -95,30 +87,17 @@ template void testRuntimeSpan() { std::span s0{}; - std::span s1(s0); // dynamic -> static + std::span s1{}; std::span s2(s1); // static -> dynamic ASSERT_NOEXCEPT(std::span {s0}); ASSERT_NOEXCEPT(std::span{s1}); ASSERT_NOEXCEPT(std::span {s1}); - ASSERT_NOEXCEPT(std::span{s0}); assert(s1.data() == nullptr && s1.size() == 0); assert(s2.data() == nullptr && s2.size() == 0); } -template -bool testConversionSpan() -{ - static_assert(std::is_convertible_v, "Bad input types to 'testConversionSpan"); - std::span s0d{}; - std::span s0s{}; - std::span s1(s0d); // dynamic -> static - std::span s2(s0s); // static -> dynamic - s1.data() == nullptr && s1.size() == 0 - && s2.data() == nullptr && s2.size() == 0; -} - struct A{}; int main(int, char**) @@ -134,9 +113,6 @@ int main(int, char**) testRuntimeSpan(); testRuntimeSpan(); -// TODO: Add some conversion tests here that aren't "X --> const X" -// assert((testConversionSpan())); - checkCV(); return 0; diff --git a/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp b/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp index 03fdd253426..88f46a88954 100644 --- a/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp +++ b/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp @@ -22,6 +22,7 @@ #include +#include #include #include diff --git a/libcxx/test/std/containers/views/span.objectrep/as_bytes.pass.cpp b/libcxx/test/std/containers/views/span.objectrep/as_bytes.pass.cpp index ff1038e0b11..6d757f35556 100644 --- a/libcxx/test/std/containers/views/span.objectrep/as_bytes.pass.cpp +++ b/libcxx/test/std/containers/views/span.objectrep/as_bytes.pass.cpp @@ -33,7 +33,7 @@ void testRuntimeSpan(Span sp) using SB = decltype(spBytes); ASSERT_SAME_TYPE(const std::byte, typename SB::element_type); - if (sp.extent == std::dynamic_extent) + if constexpr (sp.extent == std::dynamic_extent) assert(spBytes.extent == std::dynamic_extent); else assert(spBytes.extent == sizeof(typename Span::element_type) * sp.extent); diff --git a/libcxx/test/std/containers/views/span.objectrep/as_writable_bytes.pass.cpp b/libcxx/test/std/containers/views/span.objectrep/as_writable_bytes.pass.cpp index 01852ff65a1..735bfa0c00f 100644 --- a/libcxx/test/std/containers/views/span.objectrep/as_writable_bytes.pass.cpp +++ b/libcxx/test/std/containers/views/span.objectrep/as_writable_bytes.pass.cpp @@ -33,7 +33,7 @@ void testRuntimeSpan(Span sp) using SB = decltype(spBytes); ASSERT_SAME_TYPE(std::byte, typename SB::element_type); - if (sp.extent == std::dynamic_extent) + if constexpr (sp.extent == std::dynamic_extent) assert(spBytes.extent == std::dynamic_extent); else assert(spBytes.extent == sizeof(typename Span::element_type) * sp.extent); diff --git a/libcxx/test/std/containers/views/span.tuple/get.pass.cpp b/libcxx/test/std/containers/views/span.tuple/get.pass.cpp index 4c8c85ef93a..b2bed4e1501 100644 --- a/libcxx/test/std/containers/views/span.tuple/get.pass.cpp +++ b/libcxx/test/std/containers/views/span.tuple/get.pass.cpp @@ -45,9 +45,9 @@ int main(int, char**) { // static size - static_assert(testConstexprSpan<0>(std::span(iArr1, 1), iArr1 + 0), ""); - static_assert(testConstexprSpan<1>(std::span(iArr1, 2), iArr1 + 1), ""); - static_assert(testConstexprSpan<2>(std::span(iArr1, 3), iArr1 + 2), ""); + static_assert(testConstexprSpan<0>(std::span(iArr1, 4), iArr1 + 0), ""); + static_assert(testConstexprSpan<1>(std::span(iArr1, 4), iArr1 + 1), ""); + static_assert(testConstexprSpan<2>(std::span(iArr1, 4), iArr1 + 2), ""); static_assert(testConstexprSpan<3>(std::span(iArr1, 4), iArr1 + 3), ""); static_assert(testConstexprSpan<0>(std::span(iArr1 + 1, 1), iArr1 + 1), ""); @@ -57,13 +57,13 @@ int main(int, char**) // static size testRuntimeSpan<0>(std::span(iArr2, 4), iArr2); - testRuntimeSpan<1>(std::span(iArr2, 1), iArr2 + 1); - testRuntimeSpan<2>(std::span(iArr2, 2), iArr2 + 2); - testRuntimeSpan<3>(std::span(iArr2, 3), iArr2 + 3); + testRuntimeSpan<1>(std::span(iArr2, 4), iArr2 + 1); + testRuntimeSpan<2>(std::span(iArr2, 4), iArr2 + 2); + testRuntimeSpan<3>(std::span(iArr2, 4), iArr2 + 3); - testRuntimeSpan<0>(std::span(iArr2 + 1, 1), iArr2 + 1); - testRuntimeSpan<1>(std::span(iArr2 + 2, 2), iArr2 + 3); - testRuntimeSpan<2>(std::span(iArr2 + 3, 3), iArr2 + 5); + testRuntimeSpan<0>(std::span(iArr2 + 1, 1), iArr2 + 1); + testRuntimeSpan<1>(std::span(iArr2 + 2, 2), iArr2 + 3); + testRuntimeSpan<2>(std::span(iArr2 + 3, 3), iArr2 + 5); testRuntimeSpan<3>(std::span(iArr2 + 4, 4), iArr2 + 7); -- cgit v1.2.3