diff options
author | Kuba Mracek <mracek@apple.com> | 2017-04-24 16:48:30 +0000 |
---|---|---|
committer | Kuba Mracek <mracek@apple.com> | 2017-04-24 16:48:30 +0000 |
commit | 537070f680fce3fdae6a15a0bf7f25c57960db39 (patch) | |
tree | 164dd58157a37922ca9ec25aacbbc038677b1314 /test/tsan | |
parent | b4626e22fe9d8d54f24c164168dcc7ac7e8f7c5b (diff) |
[tsan] Include __tsan_external_* API from a header file instead of declaring them manually. NFC.
Differential Revision: https://reviews.llvm.org/D32384
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@301190 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/tsan')
-rw-r--r-- | test/tsan/Darwin/debug_external.cc | 2 | ||||
-rw-r--r-- | test/tsan/Darwin/external-dups.cc | 8 | ||||
-rw-r--r-- | test/tsan/test.h | 2 | ||||
-rw-r--r-- | test/tsan/unaligned_race.cc | 23 |
4 files changed, 9 insertions, 26 deletions
diff --git a/test/tsan/Darwin/debug_external.cc b/test/tsan/Darwin/debug_external.cc index 217690fc5..2418a271b 100644 --- a/test/tsan/Darwin/debug_external.cc +++ b/test/tsan/Darwin/debug_external.cc @@ -17,8 +17,6 @@ int __tsan_get_report_loc(void *report, unsigned long idx, const char **type, unsigned long trace_size); int __tsan_get_report_loc_object_type(void *report, unsigned long idx, const char **object_type); -void *__tsan_external_register_tag(const char *object_type); -void __tsan_external_assign_tag(void *addr, void *tag); } void *Thread(void *arg) { diff --git a/test/tsan/Darwin/external-dups.cc b/test/tsan/Darwin/external-dups.cc index b276977d4..79432bac4 100644 --- a/test/tsan/Darwin/external-dups.cc +++ b/test/tsan/Darwin/external-dups.cc @@ -5,14 +5,6 @@ #import "../test.h" -extern "C" { -void *__tsan_external_register_tag(const char *object_type); -void *__tsan_external_assign_tag(void *addr, void *tag); -void __tsan_external_read(void *addr, void *caller_pc, void *tag); -void __tsan_external_write(void *addr, void *caller_pc, void *tag); -void __tsan_write8(void *addr); -} - void *tag; __attribute__((no_sanitize("thread"))) diff --git a/test/tsan/test.h b/test/tsan/test.h index 6b981c09f..bc4f7aad5 100644 --- a/test/tsan/test.h +++ b/test/tsan/test.h @@ -8,6 +8,8 @@ #include <stdarg.h> #include "sanitizer_common/print_address.h" +#include <sanitizer/tsan_interface.h> + #ifdef __APPLE__ #include <mach/mach_time.h> #endif diff --git a/test/tsan/unaligned_race.cc b/test/tsan/unaligned_race.cc index 030642a4d..5850b2154 100644 --- a/test/tsan/unaligned_race.cc +++ b/test/tsan/unaligned_race.cc @@ -6,31 +6,22 @@ volatile uint64_t objs[8*2*(2 + 4 + 8)][2]; -extern "C" { -uint16_t __sanitizer_unaligned_load16(volatile void *addr); -uint32_t __sanitizer_unaligned_load32(volatile void *addr); -uint64_t __sanitizer_unaligned_load64(volatile void *addr); -void __sanitizer_unaligned_store16(volatile void *addr, uint16_t v); -void __sanitizer_unaligned_store32(volatile void *addr, uint32_t v); -void __sanitizer_unaligned_store64(volatile void *addr, uint64_t v); -} - // All this mess is to generate unique stack for each race, // otherwise tsan will suppress similar stacks. -static NOINLINE void access(volatile char *p, int sz, int rw) { +static NOINLINE void access(volatile void *p, int sz, int rw) { if (rw) { switch (sz) { - case 0: __sanitizer_unaligned_store16(p, 0); break; - case 1: __sanitizer_unaligned_store32(p, 0); break; - case 2: __sanitizer_unaligned_store64(p, 0); break; + case 0: __sanitizer_unaligned_store16((void *)p, 0); break; + case 1: __sanitizer_unaligned_store32((void *)p, 0); break; + case 2: __sanitizer_unaligned_store64((void *)p, 0); break; default: exit(1); } } else { switch (sz) { - case 0: __sanitizer_unaligned_load16(p); break; - case 1: __sanitizer_unaligned_load32(p); break; - case 2: __sanitizer_unaligned_load64(p); break; + case 0: __sanitizer_unaligned_load16((void *)p); break; + case 1: __sanitizer_unaligned_load32((void *)p); break; + case 2: __sanitizer_unaligned_load64((void *)p); break; default: exit(1); } } |