Skip to content

Commit 1206a57

Browse files
Abhinkopchencha3
authored andcommitted
Fixed build breaking due to llvm#77178 and llvm#86131 (llvm#86290)
Fixed a small issue of matching pthread signature, which was causing the build to break for the compiler-rt project after adding -Wcast-function-type-mismatch to -Wextra dignostic group (llvm#77178 & llvm#86131).
1 parent cb7ca3c commit 1206a57

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

compiler-rt/lib/asan/tests/asan_noinst_test.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ TEST(AddressSanitizer, InternalSimpleDeathTest) {
4545
EXPECT_DEATH(exit(1), "");
4646
}
4747

48-
static void MallocStress(size_t n) {
48+
static void *MallocStress(void *NumOfItrPtr) {
49+
size_t n = *((size_t *)NumOfItrPtr);
4950
u32 seed = my_rand();
5051
BufferedStackTrace stack1;
5152
stack1.trace_buffer[0] = 0xa123;
@@ -90,20 +91,21 @@ static void MallocStress(size_t n) {
9091
}
9192
for (size_t i = 0; i < vec.size(); i++)
9293
__asan::asan_free(vec[i], &stack3, __asan::FROM_MALLOC);
94+
return nullptr;
9395
}
9496

95-
9697
TEST(AddressSanitizer, NoInstMallocTest) {
97-
MallocStress(ASAN_LOW_MEMORY ? 300000 : 1000000);
98+
const size_t kNumIterations = (ASAN_LOW_MEMORY) ? 300000 : 1000000;
99+
MallocStress((void *)&kNumIterations);
98100
}
99101

100102
TEST(AddressSanitizer, ThreadedMallocStressTest) {
101103
const int kNumThreads = 4;
102-
const int kNumIterations = (ASAN_LOW_MEMORY) ? 10000 : 100000;
104+
const size_t kNumIterations = (ASAN_LOW_MEMORY) ? 10000 : 100000;
103105
pthread_t t[kNumThreads];
104106
for (int i = 0; i < kNumThreads; i++) {
105-
PTHREAD_CREATE(&t[i], 0, (void* (*)(void *x))MallocStress,
106-
(void*)kNumIterations);
107+
PTHREAD_CREATE(&t[i], 0, (void *(*)(void *x))MallocStress,
108+
(void *)&kNumIterations);
107109
}
108110
for (int i = 0; i < kNumThreads; i++) {
109111
PTHREAD_JOIN(t[i], 0);

0 commit comments

Comments
 (0)