From 26afaf0b121f7c9aec93c3734ea9ebaa8820a7ee Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Mon, 20 May 2013 14:10:58 +0000 Subject: [PATCH] Extend default blacklist logic to MSan and TSan. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@182269 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/SanitizerArgs.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Driver/SanitizerArgs.h b/lib/Driver/SanitizerArgs.h index 326d80db72..1f7ec9913b 100644 --- a/lib/Driver/SanitizerArgs.h +++ b/lib/Driver/SanitizerArgs.h @@ -203,10 +203,16 @@ class SanitizerArgs { static bool getDefaultBlacklistForKind(const Driver &D, unsigned Kind, std::string &BLPath) { - // For now, specify the default blacklist location for ASan only. - if (Kind & NeedsAsanRt) { + const char *BlacklistFile = 0; + if (Kind & NeedsAsanRt) + BlacklistFile = "asan_blacklist.txt"; + else if (Kind & NeedsMsanRt) + BlacklistFile = "msan_blacklist.txt"; + else if (Kind & NeedsTsanRt) + BlacklistFile = "tsan_blacklist.txt"; + if (BlacklistFile) { SmallString<64> Path(D.ResourceDir); - llvm::sys::path::append(Path, "asan_blacklist.txt"); + llvm::sys::path::append(Path, BlacklistFile); BLPath = Path.str(); return true; }