From 5e18126551e3012cb1a8e8d99e36ae8fa58168b3 Mon Sep 17 00:00:00 2001 From: Petr Hosek 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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@322452 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/SanitizerArgs.cpp | 2 +- test/Driver/Inputs/resource_dir/{ => share}/asan_blacklist.txt | 0 .../Driver/Inputs/resource_dir/{ => share}/hwasan_blacklist.txt | 0 test/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 test/Driver/Inputs/resource_dir/{ => share}/asan_blacklist.txt (100%) rename test/Driver/Inputs/resource_dir/{ => share}/hwasan_blacklist.txt (100%) rename test/Driver/Inputs/resource_dir/{ => share}/ubsan_blacklist.txt (100%) rename test/Driver/Inputs/resource_dir/{ => share}/vtables_blacklist.txt (100%) diff --git a/lib/Driver/SanitizerArgs.cpp b/lib/Driver/SanitizerArgs.cpp index 3c985a1f71..f1d6044033 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, 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 -- 2.40.0