diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2019-05-01 21:53:39 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2019-05-01 21:53:39 +0000 |
| commit | 692ede971f895be1b16d661ee221c1c05a48111f (patch) | |
| tree | 5b049b578c3181411e88f96aafa45b21f75749d4 | |
| parent | 3aad8d0cb76ad2cbaecd363597a0125b6f8b0b6e (diff) | |
| download | compiler-rt-692ede971f895be1b16d661ee221c1c05a48111f.tar.gz | |
[tsan] Fix and re-enable user_malloc.cc test
Summary: no_sanitize_thread is not enough as it still puts some tsan instrumentation
Reviewers: eugenis
Subscribers: kubamracek, #sanitizers, llvm-commits
Tags: #sanitizers, #llvm
Differential Revision: https://reviews.llvm.org/D61393
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359731 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/tsan/Linux/user_malloc.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/tsan/Linux/user_malloc.cc b/test/tsan/Linux/user_malloc.cc index b470e6c54..fbe023dda 100644 --- a/test/tsan/Linux/user_malloc.cc +++ b/test/tsan/Linux/user_malloc.cc @@ -1,18 +1,14 @@ -// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s - -// UNSUPPORTED: powerpc64le - -// FIXME: Remove the test or find how to fix this. -// On some distributions, probably with newer glibc, tsan initialization calls -// dlsym which then calls malloc and crashes because of tsan is not initialized. -// UNSUPPORTED: linux +// RUN: %clangxx_tsan -c -O1 -fno-sanitize=thread %s -o %t.o +// RUN: %clangxx_tsan -O1 %s %t.o -o %t && %run %t 2>&1 | FileCheck %s #include <stdio.h> +#include <stdlib.h> + +#if !__has_feature(thread_sanitizer) // Defined by tsan. extern "C" void *__interceptor_malloc(unsigned long size); extern "C" void __interceptor_free(void *p); - extern "C" void *malloc(unsigned long size) { static int first = 0; if (__sync_lock_test_and_set(&first, 1) == 0) @@ -24,12 +20,16 @@ extern "C" void free(void *p) { __interceptor_free(p); } +#else + int main() { volatile char *p = (char*)malloc(10); p[0] = 0; free((void*)p); } +#endif + // CHECK: user malloc // CHECK-NOT: ThreadSanitizer |