From c466264b34527c33291c80b770d93dc590fda0b0 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 30 Sep 2018 22:31:29 +0000 Subject: [PATCH] Use the container form llvm::sort(C, ...) There are a few leftovers in rL343163 which span two lines. This commit changes these llvm::sort(C.begin(), C.end, ...) to llvm::sort(C, ...) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343426 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfStringPool.cpp | 9 +++-- lib/CodeGen/RegisterUsageInfo.cpp | 2 +- lib/Transforms/Instrumentation/GCOVProfiling.cpp | 9 +++-- .../Utils/ImportedFunctionsInliningStatistics.cpp | 21 +++++------- lib/XRay/Trace.cpp | 2 +- tools/dsymutil/DebugMap.cpp | 6 ++-- tools/dsymutil/NonRelocatableStringpool.cpp | 9 +++-- utils/TableGen/CodeGenSchedule.cpp | 9 ++--- utils/TableGen/FastISelEmitter.cpp | 2 +- utils/TableGen/GlobalISelEmitter.cpp | 39 ++++++++++------------ 10 files changed, 48 insertions(+), 60 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp b/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp index 83c07d1fe45..02016534a77 100644 --- a/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfStringPool.cpp @@ -90,11 +90,10 @@ void DwarfStringPool::emit(AsmPrinter &Asm, MCSection *StrSection, for (const auto &E : Pool) Entries.push_back(&E); - llvm::sort( - Entries.begin(), Entries.end(), - [](const StringMapEntry *A, const StringMapEntry *B) { - return A->getValue().Offset < B->getValue().Offset; - }); + llvm::sort(Entries, [](const StringMapEntry *A, + const StringMapEntry *B) { + return A->getValue().Offset < B->getValue().Offset; + }); for (const auto &Entry : Entries) { assert(ShouldCreateSymbols == static_cast(Entry->getValue().Symbol) && diff --git a/lib/CodeGen/RegisterUsageInfo.cpp b/lib/CodeGen/RegisterUsageInfo.cpp index 6a31118cc56..1b3fbc25b6e 100644 --- a/lib/CodeGen/RegisterUsageInfo.cpp +++ b/lib/CodeGen/RegisterUsageInfo.cpp @@ -81,7 +81,7 @@ void PhysicalRegisterUsageInfo::print(raw_ostream &OS, const Module *M) const { // sort the vector to print analysis in alphabatic order of function name. llvm::sort( - FPRMPairVector.begin(), FPRMPairVector.end(), + FPRMPairVector, [](const FuncPtrRegMaskPair *A, const FuncPtrRegMaskPair *B) -> bool { return A->first->getName() < B->first->getName(); }); diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp index b4da53fd974..625b354cc38 100644 --- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -275,11 +275,10 @@ namespace { write(Len); write(Number); - llvm::sort( - SortedLinesByFile.begin(), SortedLinesByFile.end(), - [](StringMapEntry *LHS, StringMapEntry *RHS) { - return LHS->getKey() < RHS->getKey(); - }); + llvm::sort(SortedLinesByFile, [](StringMapEntry *LHS, + StringMapEntry *RHS) { + return LHS->getKey() < RHS->getKey(); + }); for (auto &I : SortedLinesByFile) I->getValue().writeOut(); write(0); diff --git a/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp b/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp index b45b422b34b..02482c55032 100644 --- a/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp +++ b/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp @@ -190,17 +190,14 @@ ImportedFunctionsInliningStatistics::getSortedNodes() { for (const NodesMapTy::value_type& Node : NodesMap) SortedNodes.push_back(&Node); - llvm::sort( - SortedNodes.begin(), SortedNodes.end(), - [&](const SortedNodesTy::value_type &Lhs, - const SortedNodesTy::value_type &Rhs) { - if (Lhs->second->NumberOfInlines != Rhs->second->NumberOfInlines) - return Lhs->second->NumberOfInlines > Rhs->second->NumberOfInlines; - if (Lhs->second->NumberOfRealInlines != - Rhs->second->NumberOfRealInlines) - return Lhs->second->NumberOfRealInlines > - Rhs->second->NumberOfRealInlines; - return Lhs->first() < Rhs->first(); - }); + llvm::sort(SortedNodes, [&](const SortedNodesTy::value_type &Lhs, + const SortedNodesTy::value_type &Rhs) { + if (Lhs->second->NumberOfInlines != Rhs->second->NumberOfInlines) + return Lhs->second->NumberOfInlines > Rhs->second->NumberOfInlines; + if (Lhs->second->NumberOfRealInlines != Rhs->second->NumberOfRealInlines) + return Lhs->second->NumberOfRealInlines > + Rhs->second->NumberOfRealInlines; + return Lhs->first() < Rhs->first(); + }); return SortedNodes; } diff --git a/lib/XRay/Trace.cpp b/lib/XRay/Trace.cpp index 15cafa51bec..1d7c723864d 100644 --- a/lib/XRay/Trace.cpp +++ b/lib/XRay/Trace.cpp @@ -311,7 +311,7 @@ Error loadFDRLog(StringRef Data, bool IsLittleEndian, for (auto &PTB : Index) { auto &Blocks = PTB.second; llvm::sort( - Blocks.begin(), Blocks.end(), + Blocks, [](const BlockIndexer::Block &L, const BlockIndexer::Block &R) { return (L.WallclockTime->seconds() < R.WallclockTime->seconds() && L.WallclockTime->nanos() < R.WallclockTime->nanos()); diff --git a/tools/dsymutil/DebugMap.cpp b/tools/dsymutil/DebugMap.cpp index 26137773a4e..509afaf56f4 100644 --- a/tools/dsymutil/DebugMap.cpp +++ b/tools/dsymutil/DebugMap.cpp @@ -63,9 +63,9 @@ void DebugMapObject::print(raw_ostream &OS) const { Entries.reserve(Symbols.getNumItems()); for (const auto &Sym : make_range(Symbols.begin(), Symbols.end())) Entries.push_back(std::make_pair(Sym.getKey(), Sym.getValue())); - llvm::sort( - Entries.begin(), Entries.end(), - [](const Entry &LHS, const Entry &RHS) { return LHS.first < RHS.first; }); + llvm::sort(Entries, [](const Entry &LHS, const Entry &RHS) { + return LHS.first < RHS.first; + }); for (const auto &Sym : Entries) { if (Sym.second.ObjectAddress) OS << format("\t%016" PRIx64, uint64_t(*Sym.second.ObjectAddress)); diff --git a/tools/dsymutil/NonRelocatableStringpool.cpp b/tools/dsymutil/NonRelocatableStringpool.cpp index 8049207c5c7..d82ff84589d 100644 --- a/tools/dsymutil/NonRelocatableStringpool.cpp +++ b/tools/dsymutil/NonRelocatableStringpool.cpp @@ -40,11 +40,10 @@ NonRelocatableStringpool::getEntriesForEmission() const { for (const auto &E : Strings) if (E.getValue().isIndexed()) Result.emplace_back(E, true); - llvm::sort( - Result.begin(), Result.end(), - [](const DwarfStringPoolEntryRef A, const DwarfStringPoolEntryRef B) { - return A.getIndex() < B.getIndex(); - }); + llvm::sort(Result, [](const DwarfStringPoolEntryRef A, + const DwarfStringPoolEntryRef B) { + return A.getIndex() < B.getIndex(); + }); return Result; } diff --git a/utils/TableGen/CodeGenSchedule.cpp b/utils/TableGen/CodeGenSchedule.cpp index 57b59108528..881f1a813f2 100644 --- a/utils/TableGen/CodeGenSchedule.cpp +++ b/utils/TableGen/CodeGenSchedule.cpp @@ -1868,12 +1868,9 @@ void CodeGenSchedModels::collectProcResources() { } // Finalize each ProcModel by sorting the record arrays. for (CodeGenProcModel &PM : ProcModels) { - llvm::sort(PM.WriteResDefs.begin(), PM.WriteResDefs.end(), - LessRecord()); - llvm::sort(PM.ReadAdvanceDefs.begin(), PM.ReadAdvanceDefs.end(), - LessRecord()); - llvm::sort(PM.ProcResourceDefs.begin(), PM.ProcResourceDefs.end(), - LessRecord()); + llvm::sort(PM.WriteResDefs, LessRecord()); + llvm::sort(PM.ReadAdvanceDefs, LessRecord()); + llvm::sort(PM.ProcResourceDefs, LessRecord()); LLVM_DEBUG( PM.dump(); dbgs() << "WriteResDefs: "; for (RecIter RI = PM.WriteResDefs.begin(), diff --git a/utils/TableGen/FastISelEmitter.cpp b/utils/TableGen/FastISelEmitter.cpp index 9d18623b107..6e04d1711cc 100644 --- a/utils/TableGen/FastISelEmitter.cpp +++ b/utils/TableGen/FastISelEmitter.cpp @@ -829,7 +829,7 @@ void FastISelMap::printFunctionDefinitions(raw_ostream &OS) { = SignaturesWithConstantForms.find(Operands); if (MI != SignaturesWithConstantForms.end()) { // Unique any duplicates out of the list. - llvm::sort(MI->second.begin(), MI->second.end()); + llvm::sort(MI->second); MI->second.erase(std::unique(MI->second.begin(), MI->second.end()), MI->second.end()); diff --git a/utils/TableGen/GlobalISelEmitter.cpp b/utils/TableGen/GlobalISelEmitter.cpp index 18a3afeb453..ad0ee3dfbc4 100644 --- a/utils/TableGen/GlobalISelEmitter.cpp +++ b/utils/TableGen/GlobalISelEmitter.cpp @@ -4394,21 +4394,20 @@ void GlobalISelEmitter::run(raw_ostream &OS) { std::vector> FeatureBitsets; for (auto &Rule : Rules) FeatureBitsets.push_back(Rule.getRequiredFeatures()); - llvm::sort( - FeatureBitsets.begin(), FeatureBitsets.end(), - [&](const std::vector &A, const std::vector &B) { - if (A.size() < B.size()) - return true; - if (A.size() > B.size()) - return false; - for (const auto &Pair : zip(A, B)) { - if (std::get<0>(Pair)->getName() < std::get<1>(Pair)->getName()) - return true; - if (std::get<0>(Pair)->getName() > std::get<1>(Pair)->getName()) - return false; - } + llvm::sort(FeatureBitsets, [&](const std::vector &A, + const std::vector &B) { + if (A.size() < B.size()) + return true; + if (A.size() > B.size()) + return false; + for (const auto &Pair : zip(A, B)) { + if (std::get<0>(Pair)->getName() < std::get<1>(Pair)->getName()) + return true; + if (std::get<0>(Pair)->getName() > std::get<1>(Pair)->getName()) return false; - }); + } + return false; + }); FeatureBitsets.erase( std::unique(FeatureBitsets.begin(), FeatureBitsets.end()), FeatureBitsets.end()); @@ -4577,13 +4576,11 @@ void RuleMatcher::optimize() { } InsnMatcher.optimize(); } - llvm::sort( - EpilogueMatchers.begin(), EpilogueMatchers.end(), - [](const std::unique_ptr &L, - const std::unique_ptr &R) { - return std::make_tuple(L->getKind(), L->getInsnVarID(), L->getOpIdx()) < - std::make_tuple(R->getKind(), R->getInsnVarID(), R->getOpIdx()); - }); + llvm::sort(EpilogueMatchers, [](const std::unique_ptr &L, + const std::unique_ptr &R) { + return std::make_tuple(L->getKind(), L->getInsnVarID(), L->getOpIdx()) < + std::make_tuple(R->getKind(), R->getInsnVarID(), R->getOpIdx()); + }); } bool RuleMatcher::hasFirstCondition() const { -- 2.11.0