Skip to content

Commit 59cc595

Browse files
committed
Fix unittest
1 parent 12573d6 commit 59cc595

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

include/swift/Basic/ImmutablePointerSet.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ class ImmutablePointerSetFactory {
240240
// Copy in the pointers into the tail allocated memory. We do not need to do
241241
// any sorting/uniquing ourselves since we assume that our users perform
242242
// this task for us.
243-
llvm::MutableArrayRef<void *> DataMem(reinterpret_cast<void **>(&Mem[1]),
244-
NumElts);
243+
llvm::MutableArrayRef<T> DataMem(reinterpret_cast<T *>(&Mem[1]),
244+
NumElts);
245245
std::copy(Array.begin(), Array.end(), DataMem.begin());
246246

247247
// Allocate the new node and insert it into the Set.

unittests/Basic/ImmutablePointerSetTest.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ using namespace swift;
1919

2020
TEST(ImmutableSortedSet, OneElementSets) {
2121
llvm::BumpPtrAllocator BPA;
22-
ImmutablePointerSetFactory<unsigned> F(BPA);
22+
ImmutablePointerSetFactory<unsigned *> F(BPA);
2323

2424
unsigned *ptr1 = (unsigned *)3;
2525
auto *OneEltSet1 = F.get(ptr1);
@@ -54,16 +54,16 @@ TEST(ImmutableSortedSet, OneElementSets) {
5454

5555
TEST(ImmutablePointerSet, MultipleElementSets) {
5656
llvm::BumpPtrAllocator BPA;
57-
ImmutablePointerSetFactory<unsigned> F(BPA);
57+
ImmutablePointerSetFactory<unsigned *> F(BPA);
5858

5959
unsigned *Ptr1 = (unsigned *)3;
6060
unsigned *Ptr2 = (unsigned *)4;
6161
unsigned *Ptr3 = (unsigned *)3;
6262
unsigned *Ptr4 = (unsigned *)5;
6363
unsigned *Ptr5 = (unsigned *)6;
6464
llvm::SmallVector<unsigned *, 2> Data1 = {Ptr1, Ptr2};
65-
66-
auto *TwoEltSet = F.get(Data1);
65+
llvm::MutableArrayRef<unsigned *> Array = Data1;
66+
auto *TwoEltSet = F.get(Array);
6767
EXPECT_FALSE(TwoEltSet->empty());
6868
EXPECT_EQ(TwoEltSet->size(), 2u);
6969
EXPECT_TRUE(TwoEltSet->count(Ptr1));
@@ -110,7 +110,7 @@ TEST(ImmutablePointerSet, MultipleElementSets) {
110110

111111
TEST(ImmutablePointerSet, EmptyIntersectionTests) {
112112
llvm::BumpPtrAllocator BPA;
113-
ImmutablePointerSetFactory<unsigned> F(BPA);
113+
ImmutablePointerSetFactory<unsigned *> F(BPA);
114114

115115
unsigned *Ptr1 = (unsigned *)3;
116116
unsigned *Ptr2 = (unsigned *)4;

0 commit comments

Comments
 (0)