From 4ed47858ab7683729827af80c7b791c23249e627 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Mon, 22 Feb 2021 20:17:16 -0800 Subject: [PATCH] [llvm] Use llvm::drop_begin (NFC) --- llvm/lib/Analysis/CGSCCPassManager.cpp | 6 ++---- llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp | 3 +-- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 3 +-- llvm/lib/Transforms/Scalar/ConstraintElimination.cpp | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/llvm/lib/Analysis/CGSCCPassManager.cpp b/llvm/lib/Analysis/CGSCCPassManager.cpp index 3230e90..f43a2de 100644 --- a/llvm/lib/Analysis/CGSCCPassManager.cpp +++ b/llvm/lib/Analysis/CGSCCPassManager.cpp @@ -872,8 +872,7 @@ incorporateNewSCCRange(const SCCRangeT &NewSCCRange, LazyCallGraph &G, if (FAM) updateNewSCCFunctionAnalyses(*C, G, AM, *FAM); - for (SCC &NewC : llvm::reverse(make_range(std::next(NewSCCRange.begin()), - NewSCCRange.end()))) { + for (SCC &NewC : llvm::reverse(llvm::drop_begin(NewSCCRange))) { assert(C != &NewC && "No need to re-visit the current SCC!"); assert(OldC != &NewC && "Already handled the original SCC!"); UR.CWorklist.insert(&NewC); @@ -1067,8 +1066,7 @@ static LazyCallGraph::SCC &updateCGAndAnalysisManagerForPass( // "bottom" we will continue processing in the bottom-up walk. assert(NewRefSCCs.front() == RC && "New current RefSCC not first in the returned list!"); - for (RefSCC *NewRC : llvm::reverse(make_range(std::next(NewRefSCCs.begin()), - NewRefSCCs.end()))) { + for (RefSCC *NewRC : llvm::reverse(llvm::drop_begin(NewRefSCCs))) { assert(NewRC != RC && "Should not encounter the current RefSCC further " "in the postorder list of new RefSCCs."); UR.RCWorklist.insert(NewRC); diff --git a/llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp b/llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp index 6247158..5b386a4 100644 --- a/llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp +++ b/llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp @@ -261,8 +261,7 @@ raw_ostream &operator<<(raw_ostream &OS, "JITDylibList entries must not be null"); OS << " (\"" << SearchOrder.front().first->getName() << "\", " << SearchOrder.begin()->second << ")"; - for (auto &KV : - make_range(std::next(SearchOrder.begin(), 1), SearchOrder.end())) { + for (auto &KV : llvm::drop_begin(SearchOrder)) { assert(KV.first && "JITDylibList entries must not be null"); OS << ", (\"" << KV.first->getName() << "\", " << KV.second << ")"; } diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp index 9b791a1..84de8ec 100644 --- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -1323,8 +1323,7 @@ void PPCLinuxAsmPrinter::emitInstruction(const MachineInstr *MI) { unsigned RetOpcode = MI->getOperand(0).getImm(); MCInst RetInst; RetInst.setOpcode(RetOpcode); - for (const auto &MO : - make_range(std::next(MI->operands_begin()), MI->operands_end())) { + for (const auto &MO : llvm::drop_begin(MI->operands())) { MCOperand MCOp; if (LowerPPCMachineOperandToMCOperand(MO, MCOp, *this)) RetInst.addOperand(MCOp); diff --git a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp index 1cfa465..f133f86 100644 --- a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp +++ b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp @@ -181,8 +181,8 @@ getConstraint(CmpInst::Predicate Pred, Value *Op0, Value *Op1, Offset1 *= -1; // Create iterator ranges that skip the constant-factor. - auto VariablesA = make_range(std::next(ADec.begin()), ADec.end()); - auto VariablesB = make_range(std::next(BDec.begin()), BDec.end()); + auto VariablesA = llvm::drop_begin(ADec); + auto VariablesB = llvm::drop_begin(BDec); // Make sure all variables have entries in Value2Index or NewIndices. for (const auto &KV : -- 2.7.4