From: Petr Hosek <phosek@chromium.org>
Date: Thu, 11 Jan 2018 00:12:02 +0000 (+0000)
Subject: Revert "[Driver] Update default sanitizer blacklist location"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73c83c145a9d19049137109fb421c6568e4f6c18;p=clang

Revert "[Driver] Update default sanitizer blacklist location"

This reverts commit r322233: this is breaking dfsan tests.

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

diff --git a/lib/Driver/SanitizerArgs.cpp b/lib/Driver/SanitizerArgs.cpp
index f1d6044033..3c985a1f71 100644
--- 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, "share", BlacklistFile);
+    llvm::sys::path::append(Path, BlacklistFile);
     BLPath = Path.str();
     return true;
   }
diff --git a/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt b/test/Driver/Inputs/resource_dir/asan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/asan_blacklist.txt
diff --git a/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt b/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
diff --git a/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt b/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
rename to test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
diff --git a/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt b/test/Driver/Inputs/resource_dir/vtables_blacklist.txt
similarity index 100%
rename from test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
rename to test/Driver/Inputs/resource_dir/vtables_blacklist.txt