mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-26 13:10:34 +00:00
rename pred_const_iterator to const_pred_iterator for consistency's sake
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99567 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
da9283cd57
commit
44424646ac
@ -67,15 +67,15 @@ public:
|
||||
|
||||
typedef PredIterator<BasicBlock, Value::use_iterator> pred_iterator;
|
||||
typedef PredIterator<const BasicBlock,
|
||||
Value::const_use_iterator> pred_const_iterator;
|
||||
Value::const_use_iterator> const_pred_iterator;
|
||||
|
||||
inline pred_iterator pred_begin(BasicBlock *BB) { return pred_iterator(BB); }
|
||||
inline pred_const_iterator pred_begin(const BasicBlock *BB) {
|
||||
return pred_const_iterator(BB);
|
||||
inline const_pred_iterator pred_begin(const BasicBlock *BB) {
|
||||
return const_pred_iterator(BB);
|
||||
}
|
||||
inline pred_iterator pred_end(BasicBlock *BB) { return pred_iterator(BB, true);}
|
||||
inline pred_const_iterator pred_end(const BasicBlock *BB) {
|
||||
return pred_const_iterator(BB, true);
|
||||
inline const_pred_iterator pred_end(const BasicBlock *BB) {
|
||||
return const_pred_iterator(BB, true);
|
||||
}
|
||||
|
||||
|
||||
@ -268,7 +268,7 @@ template <> struct GraphTraits<Inverse<BasicBlock*> > {
|
||||
|
||||
template <> struct GraphTraits<Inverse<const BasicBlock*> > {
|
||||
typedef const BasicBlock NodeType;
|
||||
typedef pred_const_iterator ChildIteratorType;
|
||||
typedef const_pred_iterator ChildIteratorType;
|
||||
static NodeType *getEntryNode(Inverse<const BasicBlock*> G) {
|
||||
return G.Graph;
|
||||
}
|
||||
|
@ -398,7 +398,7 @@ bool ProfileEstimatorPass::runOnFunction(Function &F) {
|
||||
for (Function::const_iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI) {
|
||||
const BasicBlock *BB = &(*FI);
|
||||
BlockInformation[&F][BB] = 0;
|
||||
pred_const_iterator predi = pred_begin(BB), prede = pred_end(BB);
|
||||
const_pred_iterator predi = pred_begin(BB), prede = pred_end(BB);
|
||||
if (predi == prede) {
|
||||
Edge e = getEdge(0,BB);
|
||||
setEdgeWeight(e,0);
|
||||
|
@ -67,7 +67,7 @@ ProfileInfoT<Function,BasicBlock>::getExecutionCount(const BasicBlock *BB) {
|
||||
|
||||
double Count = MissingValue;
|
||||
|
||||
pred_const_iterator PI = pred_begin(BB), PE = pred_end(BB);
|
||||
const_pred_iterator PI = pred_begin(BB), PE = pred_end(BB);
|
||||
|
||||
// Are there zero predecessors of this block?
|
||||
if (PI == PE) {
|
||||
@ -508,7 +508,7 @@ bool ProfileInfoT<Function,BasicBlock>::
|
||||
// have no value
|
||||
double incount = 0;
|
||||
SmallSet<const BasicBlock*,8> pred_visited;
|
||||
pred_const_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
const_pred_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
if (bbi==bbe) {
|
||||
Edge e = getEdge(0,BB);
|
||||
incount += readEdgeOrRemember(e, getEdgeWeight(e) ,edgetocalc,uncalculated);
|
||||
@ -582,7 +582,7 @@ bool ProfileInfoT<Function,BasicBlock>::EstimateMissingEdges(const BasicBlock *B
|
||||
double inWeight = 0;
|
||||
std::set<Edge> inMissing;
|
||||
std::set<const BasicBlock*> ProcessedPreds;
|
||||
pred_const_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
const_pred_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
if (bbi == bbe) {
|
||||
readEdge(this,getEdge(0,BB),inWeight,inMissing);
|
||||
}
|
||||
@ -639,7 +639,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
// FI != FE; ++FI) {
|
||||
// const BasicBlock* BB = &(*FI);
|
||||
// {
|
||||
// pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
// const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
// if (NBB == End) {
|
||||
// setEdgeWeight(getEdge(0,BB),0);
|
||||
// }
|
||||
@ -779,7 +779,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
// Calculate incoming flow.
|
||||
double iw = 0; unsigned inmissing = 0; unsigned incount = 0; unsigned invalid = 0;
|
||||
std::set<const BasicBlock *> Processed;
|
||||
for (pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
for (const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
NBB != End; ++NBB) {
|
||||
if (Processed.insert(*NBB).second) {
|
||||
Edge e = getEdge(*NBB, BB);
|
||||
@ -869,7 +869,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
if (getEdgeWeight(e) == MissingValue) {
|
||||
double iw = 0;
|
||||
std::set<const BasicBlock *> Processed;
|
||||
for (pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
for (const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
NBB != End; ++NBB) {
|
||||
if (Processed.insert(*NBB).second) {
|
||||
Edge e = getEdge(*NBB, BB);
|
||||
@ -893,7 +893,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
const BasicBlock *Dest;
|
||||
Path P;
|
||||
bool BackEdgeFound = false;
|
||||
for (pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
for (const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
NBB != End; ++NBB) {
|
||||
Dest = GetPath(BB, *NBB, P, GetPathToDest | GetPathWithNewEdges);
|
||||
if (Dest == *NBB) {
|
||||
@ -935,7 +935,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
// Calculate incoming flow.
|
||||
double iw = 0;
|
||||
std::set<const BasicBlock *> Processed;
|
||||
for (pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
for (const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
NBB != End; ++NBB) {
|
||||
if (Processed.insert(*NBB).second) {
|
||||
Edge e = getEdge(*NBB, BB);
|
||||
@ -965,7 +965,7 @@ void ProfileInfoT<Function,BasicBlock>::repair(const Function *F) {
|
||||
while(FI != FE && !FoundPath) {
|
||||
const BasicBlock *BB = *FI; ++FI;
|
||||
|
||||
for (pred_const_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
for (const_pred_iterator NBB = pred_begin(BB), End = pred_end(BB);
|
||||
NBB != End; ++NBB) {
|
||||
Edge e = getEdge(*NBB,BB);
|
||||
double w = getEdgeWeight(e);
|
||||
|
@ -119,7 +119,7 @@ void LoaderPass::recurseBasicBlock(const BasicBlock *BB) {
|
||||
bbi != bbe; ++bbi) {
|
||||
recurseBasicBlock(*bbi);
|
||||
}
|
||||
for (pred_const_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
for (const_pred_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
bbi != bbe; ++bbi) {
|
||||
recurseBasicBlock(*bbi);
|
||||
}
|
||||
|
@ -96,8 +96,8 @@ namespace llvm {
|
||||
double inWeight = 0;
|
||||
int inCount = 0;
|
||||
std::set<const BType*> ProcessedPreds;
|
||||
for ( pred_const_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
bbi != bbe; ++bbi ) {
|
||||
for (const_pred_iterator bbi = pred_begin(BB), bbe = pred_end(BB);
|
||||
bbi != bbe; ++bbi ) {
|
||||
if (ProcessedPreds.insert(*bbi).second) {
|
||||
typename ProfileInfoT<FType, BType>::Edge E = PI->getEdge(*bbi,BB);
|
||||
double EdgeWeight = PI->getEdgeWeight(E);
|
||||
@ -242,7 +242,7 @@ namespace llvm {
|
||||
|
||||
// Read predecessors.
|
||||
std::set<const BType*> ProcessedPreds;
|
||||
pred_const_iterator bpi = pred_begin(BB), bpe = pred_end(BB);
|
||||
const_pred_iterator bpi = pred_begin(BB), bpe = pred_end(BB);
|
||||
// If there are none, check for (0,BB) edge.
|
||||
if (bpi == bpe) {
|
||||
DI.inWeight += ReadOrAssert(PI->getEdge(0,BB));
|
||||
|
@ -94,7 +94,7 @@ bool llvm::isCriticalEdge(const TerminatorInst *TI, unsigned SuccNum,
|
||||
if (TI->getNumSuccessors() == 1) return false;
|
||||
|
||||
const BasicBlock *Dest = TI->getSuccessor(SuccNum);
|
||||
pred_const_iterator I = pred_begin(Dest), E = pred_end(Dest);
|
||||
const_pred_iterator I = pred_begin(Dest), E = pred_end(Dest);
|
||||
|
||||
// If there is more than one predecessor, this is a critical edge...
|
||||
assert(I != E && "No preds, but we have an edge to the block?");
|
||||
|
@ -1681,7 +1681,7 @@ void AssemblyWriter::printBasicBlock(const BasicBlock *BB) {
|
||||
// Output predecessors for the block...
|
||||
Out.PadToColumn(50);
|
||||
Out << ";";
|
||||
pred_const_iterator PI = pred_begin(BB), PE = pred_end(BB);
|
||||
const_pred_iterator PI = pred_begin(BB), PE = pred_end(BB);
|
||||
|
||||
if (PI == PE) {
|
||||
Out << " No predecessors!";
|
||||
|
Loading…
Reference in New Issue
Block a user