Skip to content

Commit 0d6c9f3

Browse files
committed
[ArrayRefTest] Use plain array instead of std::array in unit tests.
std::array<> doesn't seem to decay to plain pointers on some MSVC versions, causing windows build failures after 101fd87. Use plain arrays to fix windows builds, including https://lab.llvm.org/buildbot/#/builders/2/builds/22803
1 parent de6d010 commit 0d6c9f3

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

llvm/unittests/ADT/ArrayRefTest.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,25 +291,25 @@ static_assert(
291291
"should be able to construct ArrayRef from iterator_range over pointers");
292292

293293
TEST(ArrayRefTest, ArrayRefFromIteratorRange) {
294-
std::array<int, 5> A1{{42, -5, 0, 1000000, -1000000}};
295-
ArrayRef<int> A2 = make_range(A1.begin(), A1.end());
294+
int A1[] = {42, -5, 0, 1000000, -1000000, 0};
295+
ArrayRef<int> A2 = make_range(&A1[0], &A1[5]);
296296

297-
EXPECT_EQ(A1.size(), A2.size());
298-
for (std::size_t i = 0; i < A1.size(); ++i)
297+
EXPECT_EQ(5ull, A2.size());
298+
for (std::size_t i = 0; i < A2.size(); ++i)
299299
EXPECT_EQ(A1[i], A2[i]);
300300

301-
ArrayRef<const int> A3 = make_range(A1.begin(), A1.end());
302-
EXPECT_EQ(A1.size(), A3.size());
303-
for (std::size_t i = 0; i < A1.size(); ++i)
301+
ArrayRef<const int> A3 = make_range(&A1[0], &A1[5]);
302+
EXPECT_EQ(5ull, A3.size());
303+
for (std::size_t i = 0; i < A3.size(); ++i)
304304
EXPECT_EQ(A1[i], A3[i]);
305305
}
306306

307307
TEST(ArrayRefTest, ArrayRefFromIteratorConstRange) {
308-
std::array<const int, 5> A1{{42, -5, 0, 1000000, -1000000}};
309-
ArrayRef<const int> A2 = make_range(A1.begin(), A1.end());
308+
const int A1[] = {42, -5, 0, 1000000, -1000000, 0};
309+
ArrayRef<const int> A2 = make_range(&A1[0], &A1[5]);
310310

311-
EXPECT_EQ(A1.size(), A2.size());
312-
for (std::size_t i = 0; i < A1.size(); ++i)
311+
EXPECT_EQ(5ull, A2.size());
312+
for (std::size_t i = 0; i < A2.size(); ++i)
313313
EXPECT_EQ(A1[i], A2[i]);
314314
}
315315

0 commit comments

Comments
 (0)