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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@322233 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/SanitizerArgs.cpp b/lib/Driver/SanitizerArgs.cpp
index 3c985a1f71d767eede6b20d9dc21d78ed0ba3a8d..f1d6044033fc835c79db3f9cad070823b843395b 100644 (file)
--- a/lib/Driver/SanitizerArgs.cpp
+++ b/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/test/Driver/Inputs/resource_dir/asan_blacklist.txt b/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/asan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/share/asan_blacklist.txt

diff --git a/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt b/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt

diff --git a/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt b/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt

diff --git a/test/Driver/Inputs/resource_dir/vtables_blacklist.txt b/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/vtables_blacklist.txt
rename to test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt