[llvm-branch-commits] [llvm-branch] r99577 - in /llvm/branches/ggreif/const-CallSite: ./ include/llvm/Support/CFG.h lib/Analysis/ProfileEstimatorPass.cpp lib/Analysis/ProfileInfo.cpp lib/Analysis/ProfileInfoLoaderPass.cpp lib/Analysis/ProfileVerifierPass.cpp lib/Transforms/Utils/BreakCriticalEdges.cpp lib/VMCore/AsmWriter.cpp
Gabor Greif
ggreif at gmail.com
Thu Mar 25 17:17:20 PDT 2010
Author: ggreif
Date: Thu Mar 25 19:17:19 2010
New Revision: 99577
URL: http://llvm.org/viewvc/llvm-project?rev=99577&view=rev
Log:
pull in r99567 from trunk
Modified:
llvm/branches/ggreif/const-CallSite/ (props changed)
llvm/branches/ggreif/const-CallSite/include/llvm/Support/CFG.h
llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileEstimatorPass.cpp
llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfo.cpp
llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfoLoaderPass.cpp
llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileVerifierPass.cpp
llvm/branches/ggreif/const-CallSite/lib/Transforms/Utils/BreakCriticalEdges.cpp
llvm/branches/ggreif/const-CallSite/lib/VMCore/AsmWriter.cpp
Propchange: llvm/branches/ggreif/const-CallSite/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 19:17:19 2010
@@ -1,2 +1,2 @@
/llvm/branches/ggreif/InvokeInst-operands:98645-99398
-/llvm/trunk:99564
+/llvm/trunk:99564,99567
Modified: llvm/branches/ggreif/const-CallSite/include/llvm/Support/CFG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/include/llvm/Support/CFG.h?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/include/llvm/Support/CFG.h (original)
+++ llvm/branches/ggreif/const-CallSite/include/llvm/Support/CFG.h Thu Mar 25 19:17:19 2010
@@ -67,15 +67,15 @@
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<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;
}
Modified: llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileEstimatorPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileEstimatorPass.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileEstimatorPass.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileEstimatorPass.cpp Thu Mar 25 19:17:19 2010
@@ -398,7 +398,7 @@
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);
Modified: llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfo.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfo.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfo.cpp Thu Mar 25 19:17:19 2010
@@ -67,7 +67,7 @@
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 @@
// 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 @@
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 @@
// 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 @@
// 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 @@
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 @@
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 @@
// 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 @@
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);
Modified: llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfoLoaderPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfoLoaderPass.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfoLoaderPass.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileInfoLoaderPass.cpp Thu Mar 25 19:17:19 2010
@@ -119,7 +119,7 @@
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);
}
Modified: llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileVerifierPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileVerifierPass.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileVerifierPass.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/Analysis/ProfileVerifierPass.cpp Thu Mar 25 19:17:19 2010
@@ -96,8 +96,8 @@
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 @@
// 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));
Modified: llvm/branches/ggreif/const-CallSite/lib/Transforms/Utils/BreakCriticalEdges.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/Transforms/Utils/BreakCriticalEdges.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/Transforms/Utils/BreakCriticalEdges.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/Transforms/Utils/BreakCriticalEdges.cpp Thu Mar 25 19:17:19 2010
@@ -94,7 +94,7 @@
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?");
Modified: llvm/branches/ggreif/const-CallSite/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/const-CallSite/lib/VMCore/AsmWriter.cpp?rev=99577&r1=99576&r2=99577&view=diff
==============================================================================
--- llvm/branches/ggreif/const-CallSite/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/branches/ggreif/const-CallSite/lib/VMCore/AsmWriter.cpp Thu Mar 25 19:17:19 2010
@@ -1681,7 +1681,7 @@
// 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!";
More information about the llvm-branch-commits
mailing list