replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup SanitizerArgs: get rid of unused variable, make one method non-static. NFC. 

llvm-svn: 221959
This commit is contained in:
Alexey Samsonov 2014-11-14 00:46:39 +00:00
parent 259b1a4ca3
commit 59f34bbb76
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Driver/SanitizerArgs.h
View File

@ -86,6 +86,8 @@ class SanitizerArgs {
private:
void clear();
bool getDefaultBlacklist(const Driver &D, std::string &BLPath);
/// Parse a single value from a -fsanitize= or -fno-sanitize= value list.
/// Returns OR of members of the \c SanitizeKind enumeration, or \c 0
/// if \p Value is not known.
@ -119,9 +121,6 @@ class SanitizerArgs {
const llvm::opt::Arg *A,
unsigned Mask);
static bool getDefaultBlacklistForKind(const Driver &D, unsigned Kind,
std::string &BLPath);
/// Return the smallest superset of sanitizer set \p Kinds such that each
/// member of each group whose flag is set in \p Kinds has its flag set in the
/// result.

9
clang/lib/Driver/SanitizerArgs.cpp
View File

@ -36,8 +36,6 @@ void SanitizerArgs::clear() {
SanitizerArgs::SanitizerArgs(const ToolChain &TC,
const llvm::opt::ArgList &Args) {
clear();
unsigned AllAdd = 0; // All kinds of sanitizers that were turned on
// at least once (possibly, disabled further).
unsigned AllRemove = 0; // During the loop below, the accumulated set of
// sanitizers disabled by the current sanitizer
// argument or any argument after it.
@ -51,7 +49,6 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
continue;
(*I)->claim();
AllAdd |= expandGroups(Add);
AllRemove |= expandGroups(Remove);
// Avoid diagnosing any sanitizer which is disabled later.
@ -134,8 +131,7 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
// If no -fsanitize-blacklist option is specified, try to look up for
// blacklist in the resource directory.
std::string BLPath;
if (getDefaultBlacklistForKind(D, Kind, BLPath) &&
llvm::sys::fs::exists(BLPath))
if (getDefaultBlacklist(D, BLPath) && llvm::sys::fs::exists(BLPath))
BlacklistFile = BLPath;
}
@ -364,8 +360,7 @@ std::string SanitizerArgs::describeSanitizeArg(const llvm::opt::ArgList &Args,
return "-fsanitize=" + Sanitizers;
}
bool SanitizerArgs::getDefaultBlacklistForKind(const Driver &D, unsigned Kind,
std::string &BLPath) {
bool SanitizerArgs::getDefaultBlacklist(const Driver &D, std::string &BLPath) {
const char *BlacklistFile = nullptr;
if (Kind & NeedsAsanRt)
BlacklistFile = "asan_blacklist.txt";