Author: Kazu Hirata Date: 2021-01-09T09:25:00-08:00 New Revision: 6a6e382161a9e37d8022de205bd1e1ac5762befd
URL: https://github.com/llvm/llvm-project/commit/6a6e382161a9e37d8022de205bd1e1ac5762befd DIFF: https://github.com/llvm/llvm-project/commit/6a6e382161a9e37d8022de205bd1e1ac5762befd.diff LOG: [llvm] Drop unnecessary make_range (NFC) Added: Modified: llvm/lib/Analysis/LoopAccessAnalysis.cpp llvm/lib/Analysis/StackSafetyAnalysis.cpp llvm/lib/CodeGen/MachineOutliner.cpp llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp llvm/tools/dsymutil/DebugMap.cpp llvm/utils/TableGen/CodeGenSchedule.cpp llvm/utils/TableGen/InstrInfoEmitter.cpp Removed: ################################################################################ diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp index 76e172534176..e632fe25c24c 100644 --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -987,7 +987,7 @@ static bool isNoWrapAddRec(Value *Ptr, const SCEVAddRecExpr *AR, // Make sure there is only one non-const index and analyze that. Value *NonConstIndex = nullptr; - for (Value *Index : make_range(GEP->idx_begin(), GEP->idx_end())) + for (Value *Index : GEP->indices()) if (!isa<ConstantInt>(Index)) { if (NonConstIndex) return false; diff --git a/llvm/lib/Analysis/StackSafetyAnalysis.cpp b/llvm/lib/Analysis/StackSafetyAnalysis.cpp index 8c9bce4ba67c..73096eb4baef 100644 --- a/llvm/lib/Analysis/StackSafetyAnalysis.cpp +++ b/llvm/lib/Analysis/StackSafetyAnalysis.cpp @@ -456,7 +456,7 @@ FunctionInfo<GlobalValue> StackSafetyLocalAnalysis::run() { analyzeAllUses(AI, UI, SL); } - for (Argument &A : make_range(F.arg_begin(), F.arg_end())) { + for (Argument &A : F.args()) { // Non pointers and bypass arguments are not going to be used in any global // processing. if (A.getType()->isPointerTy() && !A.hasByValAttr()) { diff --git a/llvm/lib/CodeGen/MachineOutliner.cpp b/llvm/lib/CodeGen/MachineOutliner.cpp index e2c15c64dc6d..02998d41d831 100644 --- a/llvm/lib/CodeGen/MachineOutliner.cpp +++ b/llvm/lib/CodeGen/MachineOutliner.cpp @@ -688,7 +688,7 @@ MachineFunction *MachineOutliner::createOutlinedFunction( // The live-in set for the outlined function is the union of the live-ins // from all the outlining points. - for (MCPhysReg Reg : make_range(CandLiveIns.begin(), CandLiveIns.end())) + for (MCPhysReg Reg : CandLiveIns) LiveIns.addReg(Reg); } addLiveIns(MBB, LiveIns); diff --git a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 6e64a1ddf787..d189d946ab42 100644 --- a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -485,11 +485,10 @@ bool Formula::isCanonical(const Loop &L) const { // If ScaledReg is not a recurrent expr, or it is but its loop is not current // loop, meanwhile BaseRegs contains a recurrent expr reg related with current // loop, we want to swap the reg in BaseRegs with ScaledReg. - auto I = - find_if(make_range(BaseRegs.begin(), BaseRegs.end()), [&](const SCEV *S) { - return isa<const SCEVAddRecExpr>(S) && - (cast<SCEVAddRecExpr>(S)->getLoop() == &L); - }); + auto I = find_if(BaseRegs, [&](const SCEV *S) { + return isa<const SCEVAddRecExpr>(S) && + (cast<SCEVAddRecExpr>(S)->getLoop() == &L); + }); return I == BaseRegs.end(); } @@ -518,11 +517,10 @@ void Formula::canonicalize(const Loop &L) { // reg with ScaledReg. const SCEVAddRecExpr *SAR = dyn_cast<const SCEVAddRecExpr>(ScaledReg); if (!SAR || SAR->getLoop() != &L) { - auto I = find_if(make_range(BaseRegs.begin(), BaseRegs.end()), - [&](const SCEV *S) { - return isa<const SCEVAddRecExpr>(S) && - (cast<SCEVAddRecExpr>(S)->getLoop() == &L); - }); + auto I = find_if(BaseRegs, [&](const SCEV *S) { + return isa<const SCEVAddRecExpr>(S) && + (cast<SCEVAddRecExpr>(S)->getLoop() == &L); + }); if (I != BaseRegs.end()) std::swap(ScaledReg, *I); } diff --git a/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp b/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp index 7a80f3ff80a5..ac3b3505dc34 100644 --- a/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp +++ b/llvm/lib/Transforms/Vectorize/VPlanPredicator.cpp @@ -191,7 +191,7 @@ void VPlanPredicator::predicateRegionRec(VPRegionBlock *Region) { // Generate edge predicates and append them to the block predicate. RPO is // necessary since the predecessor blocks' block predicate needs to be set // before the current block's block predicate can be computed. - for (VPBlockBase *Block : make_range(RPOT.begin(), RPOT.end())) { + for (VPBlockBase *Block : RPOT) { // TODO: Handle nested regions once we start generating the same. assert(!isa<VPRegionBlock>(Block) && "Nested region not expected"); createOrPropagatePredicates(Block, Region); @@ -208,7 +208,7 @@ void VPlanPredicator::linearizeRegionRec(VPRegionBlock *Region) { ReversePostOrderTraversal<VPBlockBase *> RPOT(Region->getEntry()); VPBlockBase *PrevBlock = nullptr; - for (VPBlockBase *CurrBlock : make_range(RPOT.begin(), RPOT.end())) { + for (VPBlockBase *CurrBlock : RPOT) { // TODO: Handle nested regions once we start generating the same. assert(!isa<VPRegionBlock>(CurrBlock) && "Nested region not expected"); diff --git a/llvm/tools/dsymutil/DebugMap.cpp b/llvm/tools/dsymutil/DebugMap.cpp index 042804b2b762..605c1317b9c8 100644 --- a/llvm/tools/dsymutil/DebugMap.cpp +++ b/llvm/tools/dsymutil/DebugMap.cpp @@ -60,7 +60,7 @@ void DebugMapObject::print(raw_ostream &OS) const { using Entry = std::pair<StringRef, SymbolMapping>; std::vector<Entry> Entries; Entries.reserve(Symbols.getNumItems()); - for (const auto &Sym : make_range(Symbols.begin(), Symbols.end())) + for (const auto &Sym : Symbols) Entries.push_back(std::make_pair(Sym.getKey(), Sym.getValue())); llvm::sort(Entries, [](const Entry &LHS, const Entry &RHS) { return LHS.first < RHS.first; diff --git a/llvm/utils/TableGen/CodeGenSchedule.cpp b/llvm/utils/TableGen/CodeGenSchedule.cpp index 3210a60d9de2..8dfd18725a7b 100644 --- a/llvm/utils/TableGen/CodeGenSchedule.cpp +++ b/llvm/utils/TableGen/CodeGenSchedule.cpp @@ -86,7 +86,7 @@ struct InstRegexOp : public SetTheory::Operator { auto Pseudos = Instructions.slice(NumGeneric, NumPseudos); auto NonPseudos = Instructions.slice(NumGeneric + NumPseudos); - for (Init *Arg : make_range(Expr->arg_begin(), Expr->arg_end())) { + for (Init *Arg : Expr->getArgs()) { StringInit *SI = dyn_cast<StringInit>(Arg); if (!SI) PrintFatalError(Loc, "instregex requires pattern string: " + diff --git a/llvm/utils/TableGen/InstrInfoEmitter.cpp b/llvm/utils/TableGen/InstrInfoEmitter.cpp index 71d8eadaa61e..9ff385faec56 100644 --- a/llvm/utils/TableGen/InstrInfoEmitter.cpp +++ b/llvm/utils/TableGen/InstrInfoEmitter.cpp @@ -384,7 +384,7 @@ void InstrInfoEmitter::emitOperandTypeMappings( OperandRecords.push_back(Op.Rec); ++CurrentOffset; } else { - for (Init *Arg : make_range(MIOI->arg_begin(), MIOI->arg_end())) { + for (Init *Arg : MIOI->getArgs()) { OperandRecords.push_back(cast<DefInit>(Arg)->getDef()); ++CurrentOffset; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
