Skip to content

Commit 3abcbf9

Browse files
alinasalinas
committedMar 25, 2020
[CFG/BasicBlock] Rename succ_const to const_succ. [NFC]
Summary: Rename `succ_const_iterator` to `const_succ_iterator` and `succ_const_range` to `const_succ_range` for consistency with the predecessor iterators, and the corresponding iterators in MachineBasicBlock. Reviewers: nicholas, dblaikie, nlewycky Subscribers: hiraditya, bmahjour, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D75952
·
llvmorg-15-init2020.06-alpha
1 parent fe5c719 commit 3abcbf9

File tree

11 files changed

+36
-36
lines changed

11 files changed

+36
-36
lines changed
 

‎llvm/include/llvm/Analysis/BranchProbabilityInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class BranchProbabilityInfo {
9898
const BasicBlock *Dst) const;
9999

100100
BranchProbability getEdgeProbability(const BasicBlock *Src,
101-
succ_const_iterator Dst) const;
101+
const_succ_iterator Dst) const;
102102

103103
/// Test if an edge is hot relative to other out-edges of the Src.
104104
///

‎llvm/include/llvm/Analysis/CFGPrinter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
128128
}
129129

130130
static std::string getEdgeSourceLabel(const BasicBlock *Node,
131-
succ_const_iterator I) {
131+
const_succ_iterator I) {
132132
// Label source of conditional branches with "T" or "F"
133133
if (const BranchInst *BI = dyn_cast<BranchInst>(Node->getTerminator()))
134134
if (BI->isConditional())
@@ -150,7 +150,7 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
150150
}
151151

152152
/// Display the raw branch weights from PGO.
153-
std::string getEdgeAttributes(const BasicBlock *Node, succ_const_iterator I,
153+
std::string getEdgeAttributes(const BasicBlock *Node, const_succ_iterator I,
154154
const Function *F) {
155155
const Instruction *TI = Node->getTerminator();
156156
if (TI->getNumSuccessors() == 1)

‎llvm/include/llvm/IR/CFG.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,17 @@ class SuccIterator
238238
};
239239

240240
using succ_iterator = SuccIterator<Instruction, BasicBlock>;
241-
using succ_const_iterator = SuccIterator<const Instruction, const BasicBlock>;
241+
using const_succ_iterator = SuccIterator<const Instruction, const BasicBlock>;
242242
using succ_range = iterator_range<succ_iterator>;
243-
using succ_const_range = iterator_range<succ_const_iterator>;
243+
using const_succ_range = iterator_range<const_succ_iterator>;
244244

245245
inline succ_iterator succ_begin(Instruction *I) { return succ_iterator(I); }
246-
inline succ_const_iterator succ_begin(const Instruction *I) {
247-
return succ_const_iterator(I);
246+
inline const_succ_iterator succ_begin(const Instruction *I) {
247+
return const_succ_iterator(I);
248248
}
249249
inline succ_iterator succ_end(Instruction *I) { return succ_iterator(I, true); }
250-
inline succ_const_iterator succ_end(const Instruction *I) {
251-
return succ_const_iterator(I, true);
250+
inline const_succ_iterator succ_end(const Instruction *I) {
251+
return const_succ_iterator(I, true);
252252
}
253253
inline bool succ_empty(const Instruction *I) {
254254
return succ_begin(I) == succ_end(I);
@@ -259,21 +259,21 @@ inline unsigned succ_size(const Instruction *I) {
259259
inline succ_range successors(Instruction *I) {
260260
return succ_range(succ_begin(I), succ_end(I));
261261
}
262-
inline succ_const_range successors(const Instruction *I) {
263-
return succ_const_range(succ_begin(I), succ_end(I));
262+
inline const_succ_range successors(const Instruction *I) {
263+
return const_succ_range(succ_begin(I), succ_end(I));
264264
}
265265

266266
inline succ_iterator succ_begin(BasicBlock *BB) {
267267
return succ_iterator(BB->getTerminator());
268268
}
269-
inline succ_const_iterator succ_begin(const BasicBlock *BB) {
270-
return succ_const_iterator(BB->getTerminator());
269+
inline const_succ_iterator succ_begin(const BasicBlock *BB) {
270+
return const_succ_iterator(BB->getTerminator());
271271
}
272272
inline succ_iterator succ_end(BasicBlock *BB) {
273273
return succ_iterator(BB->getTerminator(), true);
274274
}
275-
inline succ_const_iterator succ_end(const BasicBlock *BB) {
276-
return succ_const_iterator(BB->getTerminator(), true);
275+
inline const_succ_iterator succ_end(const BasicBlock *BB) {
276+
return const_succ_iterator(BB->getTerminator(), true);
277277
}
278278
inline bool succ_empty(const BasicBlock *BB) {
279279
return succ_begin(BB) == succ_end(BB);
@@ -284,8 +284,8 @@ inline unsigned succ_size(const BasicBlock *BB) {
284284
inline succ_range successors(BasicBlock *BB) {
285285
return succ_range(succ_begin(BB), succ_end(BB));
286286
}
287-
inline succ_const_range successors(const BasicBlock *BB) {
288-
return succ_const_range(succ_begin(BB), succ_end(BB));
287+
inline const_succ_range successors(const BasicBlock *BB) {
288+
return const_succ_range(succ_begin(BB), succ_end(BB));
289289
}
290290

291291
//===--------------------------------------------------------------------===//
@@ -306,7 +306,7 @@ template <> struct GraphTraits<BasicBlock*> {
306306

307307
template <> struct GraphTraits<const BasicBlock*> {
308308
using NodeRef = const BasicBlock *;
309-
using ChildIteratorType = succ_const_iterator;
309+
using ChildIteratorType = const_succ_iterator;
310310

311311
static NodeRef getEntryNode(const BasicBlock *BB) { return BB; }
312312

‎llvm/lib/Analysis/BlockFrequencyInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static GVDAGType getGVDT() {
9898
template <>
9999
struct GraphTraits<BlockFrequencyInfo *> {
100100
using NodeRef = const BasicBlock *;
101-
using ChildIteratorType = succ_const_iterator;
101+
using ChildIteratorType = const_succ_iterator;
102102
using nodes_iterator = pointer_iterator<Function::const_iterator>;
103103

104104
static NodeRef getEntryNode(const BlockFrequencyInfo *G) {

‎llvm/lib/Analysis/BranchProbabilityInfo.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ bool BranchProbabilityInfo::calcUnreachableHeuristics(const BasicBlock *BB) {
240240
SmallVector<unsigned, 4> UnreachableEdges;
241241
SmallVector<unsigned, 4> ReachableEdges;
242242

243-
for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I)
243+
for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I)
244244
if (PostDominatedByUnreachable.count(*I))
245245
UnreachableEdges.push_back(I.getSuccessorIndex());
246246
else
@@ -386,7 +386,7 @@ bool BranchProbabilityInfo::calcColdCallHeuristics(const BasicBlock *BB) {
386386
// Determine which successors are post-dominated by a cold block.
387387
SmallVector<unsigned, 4> ColdEdges;
388388
SmallVector<unsigned, 4> NormalEdges;
389-
for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I)
389+
for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I)
390390
if (PostDominatedByColdCall.count(*I))
391391
ColdEdges.push_back(I.getSuccessorIndex());
392392
else
@@ -614,7 +614,7 @@ bool BranchProbabilityInfo::calcLoopBranchHeuristics(const BasicBlock *BB,
614614
SmallVector<unsigned, 8> InEdges; // Edges from header to the loop.
615615
SmallVector<unsigned, 8> UnlikelyEdges;
616616

617-
for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
617+
for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
618618
// Use LoopInfo if we have it, otherwise fall-back to SCC info to catch
619619
// irreducible loops.
620620
if (L) {
@@ -871,7 +871,7 @@ void BranchProbabilityInfo::print(raw_ostream &OS) const {
871871
// or the function it is currently running over.
872872
assert(LastF && "Cannot print prior to running over a function");
873873
for (const auto &BI : *LastF) {
874-
for (succ_const_iterator SI = succ_begin(&BI), SE = succ_end(&BI); SI != SE;
874+
for (const_succ_iterator SI = succ_begin(&BI), SE = succ_end(&BI); SI != SE;
875875
++SI) {
876876
printEdgeProbability(OS << " ", &BI, *SI);
877877
}
@@ -890,7 +890,7 @@ BranchProbabilityInfo::getHotSucc(const BasicBlock *BB) const {
890890
auto MaxProb = BranchProbability::getZero();
891891
const BasicBlock *MaxSucc = nullptr;
892892

893-
for (succ_const_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
893+
for (const_succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
894894
const BasicBlock *Succ = *I;
895895
auto Prob = getEdgeProbability(BB, Succ);
896896
if (Prob > MaxProb) {
@@ -923,7 +923,7 @@ BranchProbabilityInfo::getEdgeProbability(const BasicBlock *Src,
923923

924924
BranchProbability
925925
BranchProbabilityInfo::getEdgeProbability(const BasicBlock *Src,
926-
succ_const_iterator Dst) const {
926+
const_succ_iterator Dst) const {
927927
return getEdgeProbability(Src, Dst.getSuccessorIndex());
928928
}
929929

@@ -934,7 +934,7 @@ BranchProbabilityInfo::getEdgeProbability(const BasicBlock *Src,
934934
const BasicBlock *Dst) const {
935935
auto Prob = BranchProbability::getZero();
936936
bool FoundProb = false;
937-
for (succ_const_iterator I = succ_begin(Src), E = succ_end(Src); I != E; ++I)
937+
for (const_succ_iterator I = succ_begin(Src), E = succ_end(Src); I != E; ++I)
938938
if (*I == Dst) {
939939
auto MapI = Probs.find(std::make_pair(Src, I.getSuccessorIndex()));
940940
if (MapI != Probs.end()) {

‎llvm/lib/Analysis/CFG.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ void llvm::FindFunctionBackedges(const Function &F,
3131
return;
3232

3333
SmallPtrSet<const BasicBlock*, 8> Visited;
34-
SmallVector<std::pair<const BasicBlock*, succ_const_iterator>, 8> VisitStack;
34+
SmallVector<std::pair<const BasicBlock *, const_succ_iterator>, 8> VisitStack;
3535
SmallPtrSet<const BasicBlock*, 8> InStack;
3636

3737
Visited.insert(BB);
3838
VisitStack.push_back(std::make_pair(BB, succ_begin(BB)));
3939
InStack.insert(BB);
4040
do {
41-
std::pair<const BasicBlock*, succ_const_iterator> &Top = VisitStack.back();
41+
std::pair<const BasicBlock *, const_succ_iterator> &Top = VisitStack.back();
4242
const BasicBlock *ParentBB = Top.first;
43-
succ_const_iterator &I = Top.second;
43+
const_succ_iterator &I = Top.second;
4444

4545
bool FoundNew = false;
4646
while (I != succ_end(ParentBB)) {

‎llvm/lib/Analysis/SyncDependenceAnalysis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ SyncDependenceAnalysis::join_blocks(const Instruction &Term) {
369369
// compute all join points
370370
DivergencePropagator Propagator{FuncRPOT, DT, PDT, LI};
371371
const auto &TermBlock = *Term.getParent();
372-
auto JoinBlocks = Propagator.computeJoinPoints<succ_const_range>(
372+
auto JoinBlocks = Propagator.computeJoinPoints<const_succ_range>(
373373
TermBlock, successors(Term.getParent()), LI.getLoopFor(&TermBlock));
374374

375375
auto ItInserted = CachedBranchJoins.emplace(&Term, std::move(JoinBlocks));

‎llvm/lib/ExecutionEngine/Orc/SpeculateAnalyses.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void SequenceBBQuery::traverseToExitBlock(const BasicBlock *AtBB,
209209
VisitedBlocks.insert(std::make_pair(AtBB, BlockHint));
210210
}
211211

212-
succ_const_iterator PIt = succ_begin(AtBB), EIt = succ_end(AtBB);
212+
const_succ_iterator PIt = succ_begin(AtBB), EIt = succ_end(AtBB);
213213
if (PIt == EIt) // No succs.
214214
return;
215215

‎llvm/lib/IR/BasicBlock.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,15 @@ bool BasicBlock::hasNPredecessorsOrMore(unsigned N) const {
291291
}
292292

293293
const BasicBlock *BasicBlock::getSingleSuccessor() const {
294-
succ_const_iterator SI = succ_begin(this), E = succ_end(this);
294+
const_succ_iterator SI = succ_begin(this), E = succ_end(this);
295295
if (SI == E) return nullptr; // no successors
296296
const BasicBlock *TheSucc = *SI;
297297
++SI;
298298
return (SI == E) ? TheSucc : nullptr /* multiple successors */;
299299
}
300300

301301
const BasicBlock *BasicBlock::getUniqueSuccessor() const {
302-
succ_const_iterator SI = succ_begin(this), E = succ_end(this);
302+
const_succ_iterator SI = succ_begin(this), E = succ_end(this);
303303
if (SI == E) return nullptr; // No successors
304304
const BasicBlock *SuccBB = *SI;
305305
++SI;

‎llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1795,7 +1795,7 @@ void setIrrLoopHeaderMetadata(Module *M, Instruction *TI, uint64_t Count) {
17951795

17961796
template <> struct GraphTraits<PGOUseFunc *> {
17971797
using NodeRef = const BasicBlock *;
1798-
using ChildIteratorType = succ_const_iterator;
1798+
using ChildIteratorType = const_succ_iterator;
17991799
using nodes_iterator = pointer_iterator<Function::const_iterator>;
18001800

18011801
static NodeRef getEntryNode(const PGOUseFunc *G) {

‎llvm/unittests/IR/CFGBuilder.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ TEST(CFGBuilder, Rebuild) {
269269

270270
static_assert(is_trivially_copyable<succ_iterator>::value,
271271
"trivially copyable");
272-
static_assert(is_trivially_copyable<succ_const_iterator>::value,
272+
static_assert(is_trivially_copyable<const_succ_iterator>::value,
273273
"trivially copyable");
274274
static_assert(is_trivially_copyable<succ_range>::value, "trivially copyable");
275-
static_assert(is_trivially_copyable<succ_const_range>::value,
275+
static_assert(is_trivially_copyable<const_succ_range>::value,
276276
"trivially copyable");

0 commit comments

Comments
 (0)
Please sign in to comment.