diff --git a/llvm/include/llvm/Analysis/BranchProbabilityInfo.h b/llvm/include/llvm/Analysis/BranchProbabilityInfo.h --- a/llvm/include/llvm/Analysis/BranchProbabilityInfo.h +++ b/llvm/include/llvm/Analysis/BranchProbabilityInfo.h @@ -98,7 +98,7 @@ const BasicBlock *Dst) const; BranchProbability getEdgeProbability(const BasicBlock *Src, - succ_const_iterator Dst) const; + const_succ_iterator Dst) const; /// Test if an edge is hot relative to other out-edges of the Src. /// diff --git a/llvm/include/llvm/Analysis/CFGPrinter.h b/llvm/include/llvm/Analysis/CFGPrinter.h --- a/llvm/include/llvm/Analysis/CFGPrinter.h +++ b/llvm/include/llvm/Analysis/CFGPrinter.h @@ -128,7 +128,7 @@ } static std::string getEdgeSourceLabel(const BasicBlock *Node, - succ_const_iterator I) { + const_succ_iterator I) { // Label source of conditional branches with "T" or "F" if (const BranchInst *BI = dyn_cast(Node->getTerminator())) if (BI->isConditional()) @@ -150,7 +150,7 @@ } /// Display the raw branch weights from PGO. - std::string getEdgeAttributes(const BasicBlock *Node, succ_const_iterator I, + std::string getEdgeAttributes(const BasicBlock *Node, const_succ_iterator I, const Function *F) { const Instruction *TI = Node->getTerminator(); if (TI->getNumSuccessors() == 1) diff --git a/llvm/include/llvm/IR/CFG.h b/llvm/include/llvm/IR/CFG.h --- a/llvm/include/llvm/IR/CFG.h +++ b/llvm/include/llvm/IR/CFG.h @@ -238,17 +238,17 @@ }; using succ_iterator = SuccIterator; -using succ_const_iterator = SuccIterator; +using const_succ_iterator = SuccIterator; using succ_range = iterator_range; -using succ_const_range = iterator_range; +using const_succ_range = iterator_range; inline succ_iterator succ_begin(Instruction *I) { return succ_iterator(I); } -inline succ_const_iterator succ_begin(const Instruction *I) { - return succ_const_iterator(I); +inline const_succ_iterator succ_begin(const Instruction *I) { + return const_succ_iterator(I); } inline succ_iterator succ_end(Instruction *I) { return succ_iterator(I, true); } -inline succ_const_iterator succ_end(const Instruction *I) { - return succ_const_iterator(I, true); +inline const_succ_iterator succ_end(const Instruction *I) { + return const_succ_iterator(I, true); } inline bool succ_empty(const Instruction *I) { return succ_begin(I) == succ_end(I); @@ -259,21 +259,21 @@ inline succ_range successors(Instruction *I) { return succ_range(succ_begin(I), succ_end(I)); } -inline succ_const_range successors(const Instruction *I) { - return succ_const_range(succ_begin(I), succ_end(I)); +inline const_succ_range successors(const Instruction *I) { + return const_succ_range(succ_begin(I), succ_end(I)); } inline succ_iterator succ_begin(BasicBlock *BB) { return succ_iterator(BB->getTerminator()); } -inline succ_const_iterator succ_begin(const BasicBlock *BB) { - return succ_const_iterator(BB->getTerminator()); +inline const_succ_iterator succ_begin(const BasicBlock *BB) { + return const_succ_iterator(BB->getTerminator()); } inline succ_iterator succ_end(BasicBlock *BB) { return succ_iterator(BB->getTerminator(), true); } -inline succ_const_iterator succ_end(const BasicBlock *BB) { - return succ_const_iterator(BB->getTerminator(), true); +inline const_succ_iterator succ_end(const BasicBlock *BB) { + return const_succ_iterator(BB->getTerminator(), true); } inline bool succ_empty(const BasicBlock *BB) { return succ_begin(BB) == succ_end(BB); @@ -284,8 +284,8 @@ inline succ_range successors(BasicBlock *BB) { return succ_range(succ_begin(BB), succ_end(BB)); } -inline succ_const_range successors(const BasicBlock *BB) { - return succ_const_range(succ_begin(BB), succ_end(BB)); +inline const_succ_range successors(const BasicBlock *BB) { + return const_succ_range(succ_begin(BB), succ_end(BB)); } //===--------------------------------------------------------------------===// @@ -306,7 +306,7 @@ template <> struct GraphTraits { using NodeRef = const BasicBlock *; - using ChildIteratorType = succ_const_iterator; + using ChildIteratorType = const_succ_iterator; static NodeRef getEntryNode(const BasicBlock *BB) { return BB; } diff --git a/llvm/lib/Analysis/BlockFrequencyInfo.cpp b/llvm/lib/Analysis/BlockFrequencyInfo.cpp --- a/llvm/lib/Analysis/BlockFrequencyInfo.cpp +++ b/llvm/lib/Analysis/BlockFrequencyInfo.cpp @@ -98,7 +98,7 @@ template <> struct GraphTraits { using NodeRef = const BasicBlock *; - using ChildIteratorType = succ_const_iterator; + using ChildIteratorType = const_succ_iterator; using nodes_iterator = pointer_iterator; static NodeRef getEntryNode(const BlockFrequencyInfo *G) { diff --git a/llvm/lib/Analysis/BranchProbabilityInfo.cpp b/llvm/lib/Analysis/BranchProbabilityInfo.cpp --- a/llvm/lib/Analysis/BranchProbabilityInfo.cpp +++ b/llvm/lib/Analysis/BranchProbabilityInfo.cpp @@ -240,7 +240,7 @@ SmallVector UnreachableEdges; SmallVector ReachableEdges; - for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) + for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) if (PostDominatedByUnreachable.count(*I)) UnreachableEdges.push_back(I.getSuccessorIndex()); else @@ -386,7 +386,7 @@ // Determine which successors are post-dominated by a cold block. SmallVector ColdEdges; SmallVector NormalEdges; - for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) + for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) if (PostDominatedByColdCall.count(*I)) ColdEdges.push_back(I.getSuccessorIndex()); else @@ -614,7 +614,7 @@ SmallVector InEdges; // Edges from header to the loop. SmallVector UnlikelyEdges; - for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { + for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { // Use LoopInfo if we have it, otherwise fall-back to SCC info to catch // irreducible loops. if (L) { @@ -871,7 +871,7 @@ // or the function it is currently running over. assert(LastF && "Cannot print prior to running over a function"); for (const auto &BI : *LastF) { - for (succ_const_iterator SI = succ_begin(&BI), SE = succ_end(&BI); SI != SE; + for (const_succ_iterator SI = succ_begin(&BI), SE = succ_end(&BI); SI != SE; ++SI) { printEdgeProbability(OS << " ", &BI, *SI); } @@ -890,7 +890,7 @@ auto MaxProb = BranchProbability::getZero(); const BasicBlock *MaxSucc = nullptr; - for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { + for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { const BasicBlock *Succ = *I; auto Prob = getEdgeProbability(BB, Succ); if (Prob > MaxProb) { @@ -923,7 +923,7 @@ BranchProbability BranchProbabilityInfo::getEdgeProbability(const BasicBlock *Src, - succ_const_iterator Dst) const { + const_succ_iterator Dst) const { return getEdgeProbability(Src, Dst.getSuccessorIndex()); } @@ -934,7 +934,7 @@ const BasicBlock *Dst) const { auto Prob = BranchProbability::getZero(); bool FoundProb = false; - for (succ_const_iterator I = succ_begin(Src), E = succ_end(Src); I != E; ++I) + for (const_succ_iterator I = succ_begin(Src), E = succ_end(Src); I != E; ++I) if (*I == Dst) { auto MapI = Probs.find(std::make_pair(Src, I.getSuccessorIndex())); if (MapI != Probs.end()) { diff --git a/llvm/lib/Analysis/CFG.cpp b/llvm/lib/Analysis/CFG.cpp --- a/llvm/lib/Analysis/CFG.cpp +++ b/llvm/lib/Analysis/CFG.cpp @@ -31,16 +31,16 @@ return; SmallPtrSet Visited; - SmallVector, 8> VisitStack; + SmallVector, 8> VisitStack; SmallPtrSet InStack; Visited.insert(BB); VisitStack.push_back(std::make_pair(BB, succ_begin(BB))); InStack.insert(BB); do { - std::pair &Top = VisitStack.back(); + std::pair &Top = VisitStack.back(); const BasicBlock *ParentBB = Top.first; - succ_const_iterator &I = Top.second; + const_succ_iterator &I = Top.second; bool FoundNew = false; while (I != succ_end(ParentBB)) { diff --git a/llvm/lib/Analysis/SyncDependenceAnalysis.cpp b/llvm/lib/Analysis/SyncDependenceAnalysis.cpp --- a/llvm/lib/Analysis/SyncDependenceAnalysis.cpp +++ b/llvm/lib/Analysis/SyncDependenceAnalysis.cpp @@ -369,7 +369,7 @@ // compute all join points DivergencePropagator Propagator{FuncRPOT, DT, PDT, LI}; const auto &TermBlock = *Term.getParent(); - auto JoinBlocks = Propagator.computeJoinPoints( + auto JoinBlocks = Propagator.computeJoinPoints( TermBlock, successors(Term.getParent()), LI.getLoopFor(&TermBlock)); auto ItInserted = CachedBranchJoins.emplace(&Term, std::move(JoinBlocks)); diff --git a/llvm/lib/ExecutionEngine/Orc/SpeculateAnalyses.cpp b/llvm/lib/ExecutionEngine/Orc/SpeculateAnalyses.cpp --- a/llvm/lib/ExecutionEngine/Orc/SpeculateAnalyses.cpp +++ b/llvm/lib/ExecutionEngine/Orc/SpeculateAnalyses.cpp @@ -209,7 +209,7 @@ VisitedBlocks.insert(std::make_pair(AtBB, BlockHint)); } - succ_const_iterator PIt = succ_begin(AtBB), EIt = succ_end(AtBB); + const_succ_iterator PIt = succ_begin(AtBB), EIt = succ_end(AtBB); if (PIt == EIt) // No succs. return; diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp --- a/llvm/lib/IR/BasicBlock.cpp +++ b/llvm/lib/IR/BasicBlock.cpp @@ -291,7 +291,7 @@ } const BasicBlock *BasicBlock::getSingleSuccessor() const { - succ_const_iterator SI = succ_begin(this), E = succ_end(this); + const_succ_iterator SI = succ_begin(this), E = succ_end(this); if (SI == E) return nullptr; // no successors const BasicBlock *TheSucc = *SI; ++SI; @@ -299,7 +299,7 @@ } const BasicBlock *BasicBlock::getUniqueSuccessor() const { - succ_const_iterator SI = succ_begin(this), E = succ_end(this); + const_succ_iterator SI = succ_begin(this), E = succ_end(this); if (SI == E) return nullptr; // No successors const BasicBlock *SuccBB = *SI; ++SI; diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp --- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -1795,7 +1795,7 @@ template <> struct GraphTraits { using NodeRef = const BasicBlock *; - using ChildIteratorType = succ_const_iterator; + using ChildIteratorType = const_succ_iterator; using nodes_iterator = pointer_iterator; static NodeRef getEntryNode(const PGOUseFunc *G) { diff --git a/llvm/unittests/IR/CFGBuilder.cpp b/llvm/unittests/IR/CFGBuilder.cpp --- a/llvm/unittests/IR/CFGBuilder.cpp +++ b/llvm/unittests/IR/CFGBuilder.cpp @@ -269,8 +269,8 @@ static_assert(is_trivially_copyable::value, "trivially copyable"); -static_assert(is_trivially_copyable::value, +static_assert(is_trivially_copyable::value, "trivially copyable"); static_assert(is_trivially_copyable::value, "trivially copyable"); -static_assert(is_trivially_copyable::value, +static_assert(is_trivially_copyable::value, "trivially copyable");