From 84d036a0d16af1ab43a02b6054e715fb4d6397e6 Mon Sep 17 00:00:00 2001
From: Petr Hosek <phosek@chromium.org>
Date: Sun, 14 Jan 2018 03:43:17 +0000
Subject: [PATCH] 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: 322452
---
 clang/lib/Driver/SanitizerArgs.cpp                              | 2 +-
 .../Driver/Inputs/resource_dir/{ => share}/asan_blacklist.txt   | 0
 .../Driver/Inputs/resource_dir/{ => share}/hwasan_blacklist.txt | 0
 .../Driver/Inputs/resource_dir/{ => share}/ubsan_blacklist.txt  | 0
 .../Inputs/resource_dir/{ => share}/vtables_blacklist.txt       | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename clang/test/Driver/Inputs/resource_dir/{ => share}/asan_blacklist.txt (100%)
 rename clang/test/Driver/Inputs/resource_dir/{ => share}/hwasan_blacklist.txt (100%)
 rename clang/test/Driver/Inputs/resource_dir/{ => share}/ubsan_blacklist.txt (100%)
 rename clang/test/Driver/Inputs/resource_dir/{ => share}/vtables_blacklist.txt (100%)

diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp
index 3c985a1f71d7..f1d6044033fc 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
similarity index 100%
rename from clang/test/Driver/Inputs/resource_dir/asan_blacklist.txt
rename to 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
similarity index 100%
rename from clang/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
rename to 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
similarity index 100%
rename from clang/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
rename to 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
similarity index 100%
rename from clang/test/Driver/Inputs/resource_dir/vtables_blacklist.txt
rename to clang/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt