Reland "[Driver] Update default sanitizer blacklist location"

This is related to moving the sanitizer blacklists to share/
subdirectory.

Differential Revision: https://reviews.llvm.org/D41706

llvm-svn: 322233

5 files changed, 1 insertions, 1 deletions

diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp
index 3c985a1f71d..f1d6044033f 100644
--- a/clang/lib/Driver/SanitizerArgs.cpp
+++ b/clang/lib/Driver/SanitizerArgs.cpp
@@ -112,7 +112,7 @@ static bool getDefaultBlacklist(const Driver &D, SanitizerMask Kinds,
 
   if (BlacklistFile) {
     clang::SmallString<64> Path(D.ResourceDir);
-    llvm::sys::path::append(Path, BlacklistFile);
+    llvm::sys::path::append(Path, "share", BlacklistFile);
     BLPath = Path.str();
     return true;
   }
diff --git a/clang/test/Driver/Inputs/resource_dir/asan_blacklist.txt b/clang/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Driver/Inputs/resource_dir/asan_blacklist.txt
+++ b/clang/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
diff --git a/clang/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt b/clang/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
+++ b/clang/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
diff --git a/clang/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt b/clang/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
+++ b/clang/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
diff --git a/clang/test/Driver/Inputs/resource_dir/vtables_blacklist.txt b/clang/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Driver/Inputs/resource_dir/vtables_blacklist.txt
+++ b/clang/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt