[lld] r357269 - [ELF][MachO][wasm] Simplify range-style std::find{, _if} with STLExtras.h utilities. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 29 09:21:16 PDT 2019
Author: maskray
Date: Fri Mar 29 09:21:16 2019
New Revision: 357269
URL: http://llvm.org/viewvc/llvm-project?rev=357269&view=rev
Log:
[ELF][MachO][wasm] Simplify range-style std::find{,_if} with STLExtras.h utilities. NFC
Modified:
lld/trunk/ELF/AArch64ErrataFix.cpp
lld/trunk/ELF/EhFrame.cpp
lld/trunk/ELF/Writer.cpp
lld/trunk/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
lld/trunk/lib/ReaderWriter/MachO/StubsPass.cpp
lld/trunk/wasm/Writer.cpp
Modified: lld/trunk/ELF/AArch64ErrataFix.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/AArch64ErrataFix.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/ELF/AArch64ErrataFix.cpp (original)
+++ lld/trunk/ELF/AArch64ErrataFix.cpp Fri Mar 29 09:21:16 2019
@@ -551,9 +551,9 @@ static void implementPatch(uint64_t Adrp
// and replace the relocation with a R_AARCH_JUMP26 branch relocation.
// Case 4: No relocation. We must create a new R_AARCH64_JUMP26 branch
// relocation at the offset.
- auto RelIt = std::find_if(
- IS->Relocations.begin(), IS->Relocations.end(),
- [=](const Relocation &R) { return R.Offset == PatcheeOffset; });
+ auto RelIt = llvm::find_if(IS->Relocations, [=](const Relocation &R) {
+ return R.Offset == PatcheeOffset;
+ });
if (RelIt != IS->Relocations.end() &&
(RelIt->Type == R_AARCH64_JUMP26 || RelIt->Expr == R_RELAX_TLS_IE_TO_LE))
return;
Modified: lld/trunk/ELF/EhFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/EhFrame.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/ELF/EhFrame.cpp (original)
+++ lld/trunk/ELF/EhFrame.cpp Fri Mar 29 09:21:16 2019
@@ -96,7 +96,7 @@ void EhReader::skipBytes(size_t Count) {
// Read a null-terminated string.
StringRef EhReader::readString() {
- const uint8_t *End = std::find(D.begin(), D.end(), '\0');
+ const uint8_t *End = llvm::find(D, '\0');
if (End == D.end())
failOn(D.data(), "corrupted CIE (failed to read string)");
StringRef S = toStringRef(D.slice(0, End - D.begin()));
Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Fri Mar 29 09:21:16 2019
@@ -2029,7 +2029,7 @@ template <class ELFT> void Writer<ELFT>:
// Find the first section after PT_GNU_RELRO. If it is in a PT_LOAD we
// have to align it to a page.
auto End = OutputSections.end();
- auto I = std::find(OutputSections.begin(), End, P->LastSec);
+ auto I = llvm::find(OutputSections, P->LastSec);
if (I == End || (I + 1) == End)
continue;
Modified: lld/trunk/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/CompactUnwindPass.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/CompactUnwindPass.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/CompactUnwindPass.cpp Fri Mar 29 09:21:16 2019
@@ -387,12 +387,9 @@ private:
// Gather the personality functions now, so that they're in deterministic
// order (derived from the DefinedAtom order).
- if (unwindEntry.personalityFunction) {
- auto pFunc = std::find(personalities.begin(), personalities.end(),
- unwindEntry.personalityFunction);
- if (pFunc == personalities.end())
- personalities.push_back(unwindEntry.personalityFunction);
- }
+ if (unwindEntry.personalityFunction &&
+ !llvm::count(personalities, unwindEntry.personalityFunction))
+ personalities.push_back(unwindEntry.personalityFunction);
}
}
@@ -551,8 +548,7 @@ private:
}
}
- auto personality = std::find(personalities.begin(), personalities.end(),
- entry.personalityFunction);
+ auto personality = llvm::find(personalities, entry.personalityFunction);
uint32_t personalityIdx = personality == personalities.end()
? 0
: personality - personalities.begin() + 1;
Modified: lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp Fri Mar 29 09:21:16 2019
@@ -767,8 +767,7 @@ void MachOLinkingContext::registerDylib(
bool upward) const {
std::lock_guard<std::mutex> lock(_dylibsMutex);
- if (std::find(_allDylibs.begin(),
- _allDylibs.end(), dylib) == _allDylibs.end())
+ if (!llvm::count(_allDylibs, dylib))
_allDylibs.push_back(dylib);
_pathToDylibMap[dylib->installName()] = dylib;
// If path is different than install name, register path too.
Modified: lld/trunk/lib/ReaderWriter/MachO/StubsPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/StubsPass.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/StubsPass.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/StubsPass.cpp Fri Mar 29 09:21:16 2019
@@ -270,9 +270,8 @@ public:
mergedFile.addAtom(*helperCacheNLPAtom);
// Add reference to dyld_stub_binder in libSystem.dylib
- auto I = std::find_if(
- mergedFile.sharedLibrary().begin(), mergedFile.sharedLibrary().end(),
- [&](const SharedLibraryAtom *atom) {
+ auto I = llvm::find_if(
+ mergedFile.sharedLibrary(), [&](const SharedLibraryAtom *atom) {
return atom->name().equals(_stubInfo.binderSymbolName);
});
assert(I != mergedFile.sharedLibrary().end() &&
Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=357269&r1=357268&r2=357269&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Fri Mar 29 09:21:16 2019
@@ -687,10 +687,10 @@ void Writer::createProducersSection() {
std::make_pair(&Info.SDKs, &SDKs)})
for (auto &Producer : *Producers.first)
if (Producers.second->end() ==
- std::find_if(Producers.second->begin(), Producers.second->end(),
- [&](std::pair<std::string, std::string> Seen) {
- return Seen.first == Producer.first;
- }))
+ llvm::find_if(*Producers.second,
+ [&](std::pair<std::string, std::string> Seen) {
+ return Seen.first == Producer.first;
+ }))
Producers.second->push_back(Producer);
}
int FieldCount =
More information about the llvm-commits
mailing list