summaryrefslogtreecommitdiffstats
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
commit7fa20ac847781c1b681c4b3e1d27ddcbfbbff9a4 (patch)
treedfce2de4dfd537657aad3c52e9ac63d43d7c2adf
parentdf4a05d6fb1b205a82916a32b1c8f4d55ad53c5d (diff)
downloadbcm5719-llvm-7fa20ac847781c1b681c4b3e1d27ddcbfbbff9a4.tar.gz
bcm5719-llvm-7fa20ac847781c1b681c4b3e1d27ddcbfbbff9a4.zip
Add an #if SANITIZER_MAC and a comment to lsan_common's suppression for "_os_trace".
llvm-svn: 307567
-rw-r--r--compiler-rt/lib/lsan/lsan_common.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler-rt/lib/lsan/lsan_common.cc b/compiler-rt/lib/lsan/lsan_common.cc
index 7f2bc637952..db42ead83ad 100644
--- a/compiler-rt/lib/lsan/lsan_common.cc
+++ b/compiler-rt/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);
OpenPOWER on IntegriCloud