diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-01-18 06:43:13 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-01-18 06:43:13 +0000 |
| commit | c20b321d49f0eff60f1394d56e623d8ca94f24d7 (patch) | |
| tree | bd4ddc1bf192366cf4b8187705277fc76d3b04c0 /lib/tsan/lit_tests | |
| parent | 29b37ea8907bc99bf86fab89bf8dc93a520ebac4 (diff) | |
| download | compiler-rt-c20b321d49f0eff60f1394d56e623d8ca94f24d7.tar.gz | |
[sanitizer] reapply r172719, r172721-172723, r172725, and also fix the warning on Mac.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@172791 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/lit_tests')
| -rw-r--r-- | lib/tsan/lit_tests/thread_name.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/tsan/lit_tests/thread_name.cc b/lib/tsan/lit_tests/thread_name.cc index 9a86f4f29..0ca0b1769 100644 --- a/lib/tsan/lit_tests/thread_name.cc +++ b/lib/tsan/lit_tests/thread_name.cc @@ -15,8 +15,7 @@ void *Thread1(void *x) { } void *Thread2(void *x) { - AnnotateThreadName(__FILE__, __LINE__, "Thread2"); - // TODO: pthread_setname_np(pthread_self(), "Thread2"); + pthread_setname_np(pthread_self(), "Thread2"); Global--; return NULL; } |