Skip to content

Commit a1857e2

Browse files
[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 <array>. <span> isn't guaranteed to drag in <array>. (Detected by MSVC's implementation which uses a forward declaration to avoid dragging in <array>, 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<T, 0> s1{}; in testConstexprSpan() and testRuntimeSpan(), because s1 is used below. * Removed ASSERT_NOEXCEPT(std::span<T, 0>{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().
1 parent 583ba07 commit a1857e2

File tree

6 files changed

+19
-38
lines changed

6 files changed

+19
-38
lines changed

libcxx/test/std/containers/views/span.cons/container.pass.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ struct IsAContainer {
3939
constexpr size_t size() const {return 1;}
4040
constexpr T *data() {return &v_;}
4141
constexpr const T *data() const {return &v_;}
42+
constexpr T *begin() {return &v_;}
43+
constexpr const T *begin() const {return &v_;}
44+
constexpr T *end() {return &v_ + 1;}
45+
constexpr const T *end() const {return &v_ + 1;}
4246

4347
constexpr T const *getV() const {return &v_;} // for checking
4448
T v_;

libcxx/test/std/containers/views/span.cons/span.pass.cpp

+3-27
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,19 @@ void checkCV()
6363
assert(s1.size() + s2.size() + s3.size() + s4.size() == 0);
6464
}
6565

66-
// dynamic -> static
67-
{
68-
std::span<const int, 0> s1{ sp}; // a span<const int> pointing at int.
69-
std::span< volatile int, 0> s2{ sp}; // a span< volatile int> pointing at int.
70-
std::span<const volatile int, 0> s3{ sp}; // a span<const volatile int> pointing at int.
71-
std::span<const volatile int, 0> s4{ vsp}; // a span<const volatile int> pointing at volatile int.
72-
assert(s1.size() + s2.size() + s3.size() + s4.size() == 0);
73-
}
66+
// dynamic -> static (not allowed)
7467
}
7568

7669

7770
template <typename T>
7871
constexpr bool testConstexprSpan()
7972
{
8073
std::span<T> s0{};
81-
std::span<T, 0> s1(s0); // dynamic -> static
74+
std::span<T, 0> s1{};
8275
std::span<T> s2(s1); // static -> dynamic
8376
ASSERT_NOEXCEPT(std::span<T> {s0});
8477
ASSERT_NOEXCEPT(std::span<T, 0>{s1});
8578
ASSERT_NOEXCEPT(std::span<T> {s1});
86-
ASSERT_NOEXCEPT(std::span<T, 0>{s0});
8779

8880
return
8981
s1.data() == nullptr && s1.size() == 0
@@ -95,30 +87,17 @@ template <typename T>
9587
void testRuntimeSpan()
9688
{
9789
std::span<T> s0{};
98-
std::span<T, 0> s1(s0); // dynamic -> static
90+
std::span<T, 0> s1{};
9991
std::span<T> s2(s1); // static -> dynamic
10092
ASSERT_NOEXCEPT(std::span<T> {s0});
10193
ASSERT_NOEXCEPT(std::span<T, 0>{s1});
10294
ASSERT_NOEXCEPT(std::span<T> {s1});
103-
ASSERT_NOEXCEPT(std::span<T, 0>{s0});
10495

10596
assert(s1.data() == nullptr && s1.size() == 0);
10697
assert(s2.data() == nullptr && s2.size() == 0);
10798
}
10899

109100

110-
template <typename Dest, typename Src>
111-
bool testConversionSpan()
112-
{
113-
static_assert(std::is_convertible_v<Src(*)[], Dest(*)[]>, "Bad input types to 'testConversionSpan");
114-
std::span<Src> s0d{};
115-
std::span<Src> s0s{};
116-
std::span<Dest, 0> s1(s0d); // dynamic -> static
117-
std::span<Dest> s2(s0s); // static -> dynamic
118-
s1.data() == nullptr && s1.size() == 0
119-
&& s2.data() == nullptr && s2.size() == 0;
120-
}
121-
122101
struct A{};
123102

124103
int main(int, char**)
@@ -134,9 +113,6 @@ int main(int, char**)
134113
testRuntimeSpan<std::string>();
135114
testRuntimeSpan<A>();
136115

137-
// TODO: Add some conversion tests here that aren't "X --> const X"
138-
// assert((testConversionSpan<unsigned char, char>()));
139-
140116
checkCV();
141117

142118
return 0;

libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323

2424
#include <span>
25+
#include <array>
2526
#include <cassert>
2627
#include <string>
2728

libcxx/test/std/containers/views/span.objectrep/as_bytes.pass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void testRuntimeSpan(Span sp)
3333
using SB = decltype(spBytes);
3434
ASSERT_SAME_TYPE(const std::byte, typename SB::element_type);
3535

36-
if (sp.extent == std::dynamic_extent)
36+
if constexpr (sp.extent == std::dynamic_extent)
3737
assert(spBytes.extent == std::dynamic_extent);
3838
else
3939
assert(spBytes.extent == sizeof(typename Span::element_type) * sp.extent);

libcxx/test/std/containers/views/span.objectrep/as_writable_bytes.pass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void testRuntimeSpan(Span sp)
3333
using SB = decltype(spBytes);
3434
ASSERT_SAME_TYPE(std::byte, typename SB::element_type);
3535

36-
if (sp.extent == std::dynamic_extent)
36+
if constexpr (sp.extent == std::dynamic_extent)
3737
assert(spBytes.extent == std::dynamic_extent);
3838
else
3939
assert(spBytes.extent == sizeof(typename Span::element_type) * sp.extent);

libcxx/test/std/containers/views/span.tuple/get.pass.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ int main(int, char**)
4545
{
4646

4747
// static size
48-
static_assert(testConstexprSpan<0>(std::span<const int, 4>(iArr1, 1), iArr1 + 0), "");
49-
static_assert(testConstexprSpan<1>(std::span<const int, 4>(iArr1, 2), iArr1 + 1), "");
50-
static_assert(testConstexprSpan<2>(std::span<const int, 4>(iArr1, 3), iArr1 + 2), "");
48+
static_assert(testConstexprSpan<0>(std::span<const int, 4>(iArr1, 4), iArr1 + 0), "");
49+
static_assert(testConstexprSpan<1>(std::span<const int, 4>(iArr1, 4), iArr1 + 1), "");
50+
static_assert(testConstexprSpan<2>(std::span<const int, 4>(iArr1, 4), iArr1 + 2), "");
5151
static_assert(testConstexprSpan<3>(std::span<const int, 4>(iArr1, 4), iArr1 + 3), "");
5252

5353
static_assert(testConstexprSpan<0>(std::span<const int, 1>(iArr1 + 1, 1), iArr1 + 1), "");
@@ -57,13 +57,13 @@ int main(int, char**)
5757

5858
// static size
5959
testRuntimeSpan<0>(std::span<int, 4>(iArr2, 4), iArr2);
60-
testRuntimeSpan<1>(std::span<int, 4>(iArr2, 1), iArr2 + 1);
61-
testRuntimeSpan<2>(std::span<int, 4>(iArr2, 2), iArr2 + 2);
62-
testRuntimeSpan<3>(std::span<int, 4>(iArr2, 3), iArr2 + 3);
60+
testRuntimeSpan<1>(std::span<int, 4>(iArr2, 4), iArr2 + 1);
61+
testRuntimeSpan<2>(std::span<int, 4>(iArr2, 4), iArr2 + 2);
62+
testRuntimeSpan<3>(std::span<int, 4>(iArr2, 4), iArr2 + 3);
6363

64-
testRuntimeSpan<0>(std::span<int, 4>(iArr2 + 1, 1), iArr2 + 1);
65-
testRuntimeSpan<1>(std::span<int, 4>(iArr2 + 2, 2), iArr2 + 3);
66-
testRuntimeSpan<2>(std::span<int, 4>(iArr2 + 3, 3), iArr2 + 5);
64+
testRuntimeSpan<0>(std::span<int, 1>(iArr2 + 1, 1), iArr2 + 1);
65+
testRuntimeSpan<1>(std::span<int, 2>(iArr2 + 2, 2), iArr2 + 3);
66+
testRuntimeSpan<2>(std::span<int, 3>(iArr2 + 3, 3), iArr2 + 5);
6767
testRuntimeSpan<3>(std::span<int, 4>(iArr2 + 4, 4), iArr2 + 7);
6868

6969

0 commit comments

Comments
 (0)