diff options
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 7 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 26 |
2 files changed, 14 insertions, 19 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 7ecd3db7592..40e4a3a493c 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -498,10 +498,9 @@ static InsertAction computeInsertAction(ArchiveOperation Operation, if (Operation == QuickAppend || Members.empty()) return IA_AddOldMember; - auto MI = - std::find_if(Members.begin(), Members.end(), [Name](StringRef Path) { - return Name == sys::path::filename(Path); - }); + auto MI = find_if(Members, [Name](StringRef Path) { + return Name == sys::path::filename(Path); + }); if (MI == Members.end()) return IA_AddOldMember; diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index b5e7a067b7c..d0ac915e90a 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -880,11 +880,9 @@ static void DumpLiteralPointerSection(MachOObjectFile *O, } // For local references see what the section the literal pointer points to. - auto Sect = std::find_if(LiteralSections.begin(), LiteralSections.end(), - [&](const SectionRef &R) { - return lp >= R.getAddress() && - lp < R.getAddress() + R.getSize(); - }); + auto Sect = find_if(LiteralSections, [&](const SectionRef &R) { + return lp >= R.getAddress() && lp < R.getAddress() + R.getSize(); + }); if (Sect == LiteralSections.end()) { outs() << format("0x%" PRIx64, lp) << " (not in a literal section)\n"; continue; @@ -2040,11 +2038,10 @@ static int SymbolizerGetOpInfo(void *DisInfo, uint64_t Pc, uint64_t Offset, bool r_scattered = false; uint32_t r_value, pair_r_value, r_type, r_length, other_half; auto Reloc = - std::find_if(info->S.relocations().begin(), info->S.relocations().end(), - [&](const RelocationRef &Reloc) { - uint64_t RelocOffset = Reloc.getOffset(); - return RelocOffset == sect_offset; - }); + find_if(info->S.relocations(), [&](const RelocationRef &Reloc) { + uint64_t RelocOffset = Reloc.getOffset(); + return RelocOffset == sect_offset; + }); if (Reloc == info->S.relocations().end()) return 0; @@ -2179,11 +2176,10 @@ static int SymbolizerGetOpInfo(void *DisInfo, uint64_t Pc, uint64_t Offset, uint64_t sect_addr = info->S.getAddress(); uint64_t sect_offset = (Pc + Offset) - sect_addr; auto Reloc = - std::find_if(info->S.relocations().begin(), info->S.relocations().end(), - [&](const RelocationRef &Reloc) { - uint64_t RelocOffset = Reloc.getOffset(); - return RelocOffset == sect_offset; - }); + find_if(info->S.relocations(), [&](const RelocationRef &Reloc) { + uint64_t RelocOffset = Reloc.getOffset(); + return RelocOffset == sect_offset; + }); if (Reloc == info->S.relocations().end()) return 0; |
