[asan] fix issue 35: don't let the optimizer to optimize the test code away.

llvm-svn: 149296
This commit is contained in:
Kostya Serebryany 2012-01-30 23:23:26 +00:00
parent 5b3b5f07fe
commit 39ba3f724f
2 changed files with 11 additions and 6 deletions

View File

@ -32,6 +32,10 @@ void CFAllocatorMallocZoneDoubleFree() {
CFAllocatorDeallocate(kCFAllocatorMallocZone, mem); CFAllocatorDeallocate(kCFAllocatorMallocZone, mem);
} }
__attribute__((noinline))
void access_memory(char *a) {
*a = 0;
}
// Test the +load instrumentation. // Test the +load instrumentation.
// Because the +load methods are invoked before anything else is initialized, // Because the +load methods are invoked before anything else is initialized,
@ -51,7 +55,8 @@ char kStartupStr[] =
+(void) load { +(void) load {
for (int i = 0; i < strlen(kStartupStr); i++) { for (int i = 0; i < strlen(kStartupStr); i++) {
volatile char ch = kStartupStr[i]; // make sure no optimizations occur. // TODO: this is currently broken, see Issue 33.
// access_memory(&kStartupStr[i]); // make sure no optimizations occur.
} }
// Don't print anything here not to interfere with the death tests. // Don't print anything here not to interfere with the death tests.
} }
@ -66,7 +71,7 @@ void worker_do_alloc(int size) {
void worker_do_crash(int size) { void worker_do_crash(int size) {
char * volatile mem = malloc(size); char * volatile mem = malloc(size);
mem[size] = 0; // BOOM access_memory(&mem[size]); // BOOM
free(mem); free(mem);
} }
@ -162,7 +167,7 @@ void TestGCDSourceEvent() {
dispatch_source_set_timer(timer, milestone, DISPATCH_TIME_FOREVER, 0); dispatch_source_set_timer(timer, milestone, DISPATCH_TIME_FOREVER, 0);
char * volatile mem = malloc(10); char * volatile mem = malloc(10);
dispatch_source_set_event_handler(timer, ^{ dispatch_source_set_event_handler(timer, ^{
mem[10] = 1; access_memory(&mem[10]);
}); });
dispatch_resume(timer); dispatch_resume(timer);
sleep(2); sleep(2);
@ -186,7 +191,7 @@ void TestGCDSourceCancel() {
dispatch_source_cancel(timer); dispatch_source_cancel(timer);
}); });
dispatch_source_set_cancel_handler(timer, ^{ dispatch_source_set_cancel_handler(timer, ^{
mem[10] = 1; access_memory(&mem[10]);
}); });
dispatch_resume(timer); dispatch_resume(timer);
sleep(2); sleep(2);
@ -197,7 +202,7 @@ void TestGCDGroupAsync() {
dispatch_group_t group = dispatch_group_create(); dispatch_group_t group = dispatch_group_create();
char * volatile mem = malloc(10); char * volatile mem = malloc(10);
dispatch_group_async(group, queue, ^{ dispatch_group_async(group, queue, ^{
mem[10] = 1; access_memory(&mem[10]);
}); });
dispatch_group_wait(group, DISPATCH_TIME_FOREVER); dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
} }

View File

@ -1668,7 +1668,7 @@ TEST(AddressSanitizer, LargeStructCopyTest) {
*Ident(&a) = *Ident(&a); *Ident(&a) = *Ident(&a);
} }
__attribute__((no_address_safety_analysis)) __attribute__((no_address_safety_analysis))
static void NoAddressSafety() { static void NoAddressSafety() {
char *foo = new char[10]; char *foo = new char[10];
Ident(foo)[10] = 0; Ident(foo)[10] = 0;