maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-nm, llvm-objdump] Use llvm::is_contained (NFC)

This commit is contained in:
Kazu Hirata 2020-12-25 09:22:37 -08:00
parent 35676a4f9a
commit ea39991251
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/tools/llvm-nm/llvm-nm.cpp
View File

@ -1811,9 +1811,7 @@ static bool checkMachOAndArchFlags(SymbolicFile *O, std::string &Filename) {
&McpuDefault, &ArchFlag);
}
const std::string ArchFlagName(ArchFlag);
if (none_of(ArchFlags, [&](const std::string &Name) {
return Name == ArchFlagName;
})) {
if (!llvm::is_contained(ArchFlags, ArchFlagName)) {
error("No architecture specified", Filename);
return false;
}
@ -2115,8 +2113,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
for (const TapiUniversal::ObjectForArch &I : TU->objects()) {
StringRef ArchName = I.getArchFlagName();
const bool ShowArch =
ArchFlags.empty() ||
any_of(ArchFlags, [&](StringRef Name) { return Name == ArchName; });
ArchFlags.empty() || llvm::is_contained(ArchFlags, ArchName);
if (!ShowArch)
continue;
if (!AddInlinedInfo && !I.isTopLevelLib())

4
llvm/tools/llvm-objdump/MachODump.cpp
View File

@ -1889,9 +1889,7 @@ static bool checkMachOAndArchFlags(ObjectFile *O, StringRef Filename) {
&McpuDefault, &ArchFlag);
}
const std::string ArchFlagName(ArchFlag);
if (none_of(ArchFlags, [&](const std::string &Name) {
return Name == ArchFlagName;
})) {
if (!llvm::is_contained(ArchFlags, ArchFlagName)) {
WithColor::error(errs(), "llvm-objdump")
<< Filename << ": no architecture specified.\n";
return false;