diff --git a/llvm/test/tools/sancov/ignorelist.test b/llvm/test/tools/sancov/ignorelist.test index eccedd2e7c549..01d03aed05b23 100644 --- a/llvm/test/tools/sancov/ignorelist.test +++ b/llvm/test/tools/sancov/ignorelist.test @@ -1,12 +1,9 @@ REQUIRES: x86-registered-target && host-byteorder-little-endian RUN: sancov -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefix=ALL RUN: sancov -covered-functions -ignorelist %p/Inputs/fun_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s -RUN: sancov -covered-functions -blacklist %p/Inputs/fun_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s RUN: sancov -covered-functions -ignorelist %p/Inputs/src_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 %s -RUN: sancov -covered-functions -blacklist %p/Inputs/src_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 %s RUN: sancov -print-coverage-stats %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=STATS %s RUN: sancov -print-coverage-stats -ignorelist %p/Inputs/fun_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=STATS-BLIST %s -RUN: sancov -print-coverage-stats -blacklist %p/Inputs/fun_ignorelist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=STATS-BLIST %s ALL: test.cpp:12 bar(std::string) ALL: test.cpp:14 main diff --git a/llvm/tools/sancov/sancov.cpp b/llvm/tools/sancov/sancov.cpp index e7c985c558b5c..9d29e9a13315c 100644 --- a/llvm/tools/sancov/sancov.cpp +++ b/llvm/tools/sancov/sancov.cpp @@ -114,15 +114,6 @@ static cl::opt cl::desc("Ignorelist file (sanitizer ignorelist format)"), cl::cat(Cat)); -static cl::opt - ClBlacklist("blacklist", cl::init(""), cl::Hidden, - cl::desc("ignorelist file (sanitizer ignorelist format)"), - cl::cat(Cat)); - -static cl::opt ClUseDefaultBlacklist( - "use_default_blacklist", cl::init(true), cl::Hidden, - cl::desc("Controls if default ignorelist should be used"), cl::cat(Cat)); - static cl::opt ClUseDefaultIgnorelist( "use_default_ignorelist", cl::init(true), cl::Hidden, cl::desc("Controls if default ignorelist should be used"), cl::cat(Cat)); @@ -514,7 +505,7 @@ class Ignorelists { private: static std::unique_ptr createDefaultIgnorelist() { - if ((!ClUseDefaultIgnorelist) && (!ClUseDefaultBlacklist)) + if (!ClUseDefaultIgnorelist) return std::unique_ptr(); std::unique_ptr MB = MemoryBuffer::getMemBuffer(DefaultIgnorelistStr); @@ -525,13 +516,8 @@ class Ignorelists { } static std::unique_ptr createUserIgnorelist() { - if ((ClBlacklist.empty()) && ClIgnorelist.empty()) + if (ClIgnorelist.empty()) return std::unique_ptr(); - - if (!ClBlacklist.empty()) - return SpecialCaseList::createOrDie({{ClBlacklist}}, - *vfs::getRealFileSystem()); - return SpecialCaseList::createOrDie({{ClIgnorelist}}, *vfs::getRealFileSystem()); }