summaryrefslogtreecommitdiff
path: root/lib/lsan
diff options
context:
space:
mode:
authorKuba Mracek <mracek@apple.com>2017-07-10 18:55:33 +0000
committerKuba Mracek <mracek@apple.com>2017-07-10 18:55:33 +0000
commitb8c00bd80457207a14e53c316ad857fbc8734f30 (patch)
tree3af1929aab4c59f4530f3c66a9104312f904ad85 /lib/lsan
parentbd3d53bd67d799aa8ba66abf0b305e0d077dba0f (diff)
Add an #if SANITIZER_MAC and a comment to lsan_common's suppression for "_os_trace".
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@307567 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/lsan')
-rw-r--r--lib/lsan/lsan_common.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/lsan/lsan_common.cc b/lib/lsan/lsan_common.cc
index 7f2bc6379..db42ead83 100644
--- a/lib/lsan/lsan_common.cc
+++ b/lib/lsan/lsan_common.cc
@@ -74,11 +74,13 @@ static const char kStdSuppressions[] =
// definition.
"leak:*pthread_exit*\n"
#endif // SANITIZER_SUPPRESS_LEAK_ON_PTHREAD_EXIT
+#if SANITIZER_MAC
+ // For Darwin and os_log/os_trace: https://reviews.llvm.org/D35173
+ "leak:*_os_trace*\n"
+#endif
// TLS leak in some glibc versions, described in
// https://sourceware.org/bugzilla/show_bug.cgi?id=12650.
- "leak:*tls_get_addr*\n"
- // For Darwin and os_log/os_trace.
- "leak:*_os_trace*\n";
+ "leak:*tls_get_addr*\n";
void InitializeSuppressions() {
CHECK_EQ(nullptr, suppression_ctx);