r322242 - Revert "[Driver] Update default sanitizer blacklist location"

[Petr Hosek via cfe-commits]

Author: phosek
Date: Wed Jan 10 16:12:02 2018
New Revision: 322242

URL: http://llvm.org/viewvc/llvm-project?rev=322242&view=rev
Log:
Revert "[Driver] Update default sanitizer blacklist location"

This reverts commit r322233: this is breaking dfsan tests.

Added:
    cfe/trunk/test/Driver/Inputs/resource_dir/asan_blacklist.txt
      - copied, changed from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt
      - copied, changed from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt
      - copied, changed from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/vtables_blacklist.txt
      - copied, changed from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
Removed:
    cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
    cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
Modified:
    cfe/trunk/lib/Driver/SanitizerArgs.cpp

Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=322242&r1=322241&r2=322242&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original)
+++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Wed Jan 10 16:12:02 2018
@@ -112,7 +112,7 @@ static bool getDefaultBlacklist(const Dr
 
   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;
   }

Copied: cfe/trunk/test/Driver/Inputs/resource_dir/asan_blacklist.txt (from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/asan_blacklist.txt?p2=cfe/trunk/test/Driver/Inputs/resource_dir/asan_blacklist.txt&p1=cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt&r1=322240&r2=322242&rev=322242&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt (from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt?p2=cfe/trunk/test/Driver/Inputs/resource_dir/hwasan_blacklist.txt&p1=cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt&r1=322240&r2=322242&rev=322242&view=diff
==============================================================================
    (empty)

Removed: cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/share/asan_blacklist.txt?rev=322241&view=auto
==============================================================================
    (empty)

Removed: cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/share/hwasan_blacklist.txt?rev=322241&view=auto
==============================================================================
    (empty)

Removed: cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt?rev=322241&view=auto
==============================================================================
    (empty)

Removed: cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt?rev=322241&view=auto
==============================================================================
    (empty)

Copied: cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt (from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt?p2=cfe/trunk/test/Driver/Inputs/resource_dir/ubsan_blacklist.txt&p1=cfe/trunk/test/Driver/Inputs/resource_dir/share/ubsan_blacklist.txt&r1=322240&r2=322242&rev=322242&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/Driver/Inputs/resource_dir/vtables_blacklist.txt (from r322240, cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/resource_dir/vtables_blacklist.txt?p2=cfe/trunk/test/Driver/Inputs/resource_dir/vtables_blacklist.txt&p1=cfe/trunk/test/Driver/Inputs/resource_dir/share/vtables_blacklist.txt&r1=322240&r2=322242&rev=322242&view=diff
==============================================================================
    (empty)