Rename Function::getEntryNode -> getEntryBlock

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8625 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-09-20 14:39:18 +00:00
parent 894707117e
commit 02a3be020a
13 changed files with 21 additions and 20 deletions

View File

@@ -217,7 +217,7 @@ template <> struct GraphTraits<Inverse<const BasicBlock*> > {
// except that the root node is implicitly the first node of the function. // except that the root node is implicitly the first node of the function.
// //
template <> struct GraphTraits<Function*> : public GraphTraits<BasicBlock*> { template <> struct GraphTraits<Function*> : public GraphTraits<BasicBlock*> {
static NodeType *getEntryNode(Function *F) { return &F->getEntryNode(); } static NodeType *getEntryNode(Function *F) { return &F->getEntryBlock(); }
// nodes_iterator/begin/end - Allow iteration over all nodes in the graph // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
typedef Function::iterator nodes_iterator; typedef Function::iterator nodes_iterator;
@@ -226,7 +226,7 @@ template <> struct GraphTraits<Function*> : public GraphTraits<BasicBlock*> {
}; };
template <> struct GraphTraits<const Function*> : template <> struct GraphTraits<const Function*> :
public GraphTraits<const BasicBlock*> { public GraphTraits<const BasicBlock*> {
static NodeType *getEntryNode(const Function *F) { return &F->getEntryNode();} static NodeType *getEntryNode(const Function *F) {return &F->getEntryBlock();}
// nodes_iterator/begin/end - Allow iteration over all nodes in the graph // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
typedef Function::const_iterator nodes_iterator; typedef Function::const_iterator nodes_iterator;
@@ -243,13 +243,13 @@ template <> struct GraphTraits<const Function*> :
template <> struct GraphTraits<Inverse<Function*> > : template <> struct GraphTraits<Inverse<Function*> > :
public GraphTraits<Inverse<BasicBlock*> > { public GraphTraits<Inverse<BasicBlock*> > {
static NodeType *getEntryNode(Inverse<Function*> G) { static NodeType *getEntryNode(Inverse<Function*> G) {
return &G.Graph->getEntryNode(); return &G.Graph->getEntryBlock();
} }
}; };
template <> struct GraphTraits<Inverse<const Function*> > : template <> struct GraphTraits<Inverse<const Function*> > :
public GraphTraits<Inverse<const BasicBlock*> > { public GraphTraits<Inverse<const BasicBlock*> > {
static NodeType *getEntryNode(Inverse<const Function *> G) { static NodeType *getEntryNode(Inverse<const Function *> G) {
return &G.Graph->getEntryNode(); return &G.Graph->getEntryBlock();
} }
}; };

View File

@@ -105,7 +105,7 @@ namespace {
if (!AI) return false; if (!AI) return false;
if (AI->isArrayAllocation()) if (AI->isArrayAllocation())
return 0; // FIXME: we can also inline fixed size array allocas! return 0; // FIXME: we can also inline fixed size array allocas!
if (AI->getParent() != &AI->getParent()->getParent()->getEntryNode()) if (AI->getParent() != &AI->getParent()->getParent()->getEntryBlock())
return 0; return 0;
return AI; return AI;
} }

View File

@@ -105,7 +105,7 @@ namespace {
if (!AI) return false; if (!AI) return false;
if (AI->isArrayAllocation()) if (AI->isArrayAllocation())
return 0; // FIXME: we can also inline fixed size array allocas! return 0; // FIXME: we can also inline fixed size array allocas!
if (AI->getParent() != &AI->getParent()->getParent()->getEntryNode()) if (AI->getParent() != &AI->getParent()->getParent()->getEntryBlock())
return 0; return 0;
return AI; return AI;
} }

View File

@@ -268,7 +268,7 @@ AllocaInst* LowerSetJmp::GetSetJmpMap(Function* Func)
// Insert the setjmp map initialization before the first instruction in // Insert the setjmp map initialization before the first instruction in
// the function. // the function.
Instruction* Inst = Func->getEntryNode().begin(); Instruction* Inst = Func->getEntryBlock().begin();
assert(Inst && "Couldn't find even ONE instruction in entry block!"); assert(Inst && "Couldn't find even ONE instruction in entry block!");
// Fill in the alloca and call to initialize the SJ map. // Fill in the alloca and call to initialize the SJ map.

View File

@@ -228,7 +228,7 @@ bool ProfilePaths::runOnFunction(Function &F){
// insert initialization code in first (entry) BB // insert initialization code in first (entry) BB
// this includes initializing r and count // this includes initializing r and count
insertInTopBB(&F.getEntryNode(),numPaths, rVar, threshold); insertInTopBB(&F.getEntryBlock(), numPaths, rVar, threshold);
//now process the graph: get path numbers, //now process the graph: get path numbers,
//get increments along different paths, //get increments along different paths,

View File

@@ -348,7 +348,7 @@ static void TraceValuesAtBBExit(BasicBlock *BB,
static inline void InsertCodeToShowFunctionEntry(Function &F, Function *Printf, static inline void InsertCodeToShowFunctionEntry(Function &F, Function *Printf,
Function* HashPtrToSeqNum){ Function* HashPtrToSeqNum){
// Get an iterator to point to the insertion location // Get an iterator to point to the insertion location
BasicBlock &BB = F.getEntryNode(); BasicBlock &BB = F.getEntryBlock();
Instruction *InsertPos = BB.begin(); Instruction *InsertPos = BB.begin();
std::ostringstream OutStr; std::ostringstream OutStr;
@@ -398,7 +398,7 @@ bool InsertTraceCode::runOnFunction(Function &F) {
// Push a pointer set for recording alloca'd pointers at entry. // Push a pointer set for recording alloca'd pointers at entry.
if (!DisablePtrHashing) if (!DisablePtrHashing)
new CallInst(externalFuncs.PushOnEntryFunc, vector<Value*>(), "", new CallInst(externalFuncs.PushOnEntryFunc, vector<Value*>(), "",
F.getEntryNode().begin()); F.getEntryBlock().begin());
for (Function::iterator BB = F.begin(); BB != F.end(); ++BB) { for (Function::iterator BB = F.begin(); BB != F.end(); ++BB) {
if (isa<ReturnInst>(BB->getTerminator())) if (isa<ReturnInst>(BB->getTerminator()))

View File

@@ -195,7 +195,7 @@ bool ADCE::doADCE() {
// transformations safely. // transformations safely.
// //
PostDominatorTree &DT = getAnalysis<PostDominatorTree>(); PostDominatorTree &DT = getAnalysis<PostDominatorTree>();
if (DT[&Func->getEntryNode()] == 0) { if (DT[&Func->getEntryBlock()] == 0) {
WorkList.clear(); WorkList.clear();
return MadeChanges; return MadeChanges;
} }

View File

@@ -291,7 +291,7 @@ bool CEE::runOnFunction(Function &F) {
DT = &getAnalysis<DominatorTree>(); DT = &getAnalysis<DominatorTree>();
std::set<BasicBlock*> VisitedBlocks; std::set<BasicBlock*> VisitedBlocks;
bool Changed = TransformRegion(&F.getEntryNode(), VisitedBlocks); bool Changed = TransformRegion(&F.getEntryBlock(), VisitedBlocks);
RegionInfoMap.clear(); RegionInfoMap.clear();
RankMap.clear(); RankMap.clear();

View File

@@ -75,7 +75,7 @@ bool SROA::performPromotion(Function &F) {
std::vector<AllocaInst*> Allocas; std::vector<AllocaInst*> Allocas;
const TargetData &TD = getAnalysis<TargetData>(); const TargetData &TD = getAnalysis<TargetData>();
BasicBlock &BB = F.getEntryNode(); // Get the entry node for the function BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function
bool Changed = false; bool Changed = false;
@@ -108,7 +108,7 @@ bool SROA::performScalarRepl(Function &F) {
std::vector<AllocationInst*> WorkList; std::vector<AllocationInst*> WorkList;
// Scan the entry basic block, adding any alloca's and mallocs to the worklist // Scan the entry basic block, adding any alloca's and mallocs to the worklist
BasicBlock &BB = F.getEntryNode(); BasicBlock &BB = F.getEntryBlock();
for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I) for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I)
if (AllocationInst *A = dyn_cast<AllocationInst>(I)) if (AllocationInst *A = dyn_cast<AllocationInst>(I))
WorkList.push_back(A); WorkList.push_back(A);

View File

@@ -62,7 +62,7 @@ bool TailCallElim::runOnFunction(Function &F) {
// Ok, so this is the first tail call we have found in this // Ok, so this is the first tail call we have found in this
// function. Insert a new entry block into the function, allowing // function. Insert a new entry block into the function, allowing
// us to branch back to the old entry block. // us to branch back to the old entry block.
OldEntry = &F.getEntryNode(); OldEntry = &F.getEntryBlock();
BasicBlock *NewEntry = new BasicBlock("tailrecurse", OldEntry); BasicBlock *NewEntry = new BasicBlock("tailrecurse", OldEntry);
NewEntry->getInstList().push_back(new BranchInst(OldEntry)); NewEntry->getInstList().push_back(new BranchInst(OldEntry));

View File

@@ -38,7 +38,7 @@ bool PromotePass::runOnFunction(Function &F) {
std::vector<AllocaInst*> Allocas; std::vector<AllocaInst*> Allocas;
const TargetData &TD = getAnalysis<TargetData>(); const TargetData &TD = getAnalysis<TargetData>();
BasicBlock &BB = F.getEntryNode(); // Get the entry node for the function BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function
bool Changed = false; bool Changed = false;

View File

@@ -87,7 +87,7 @@ void DominatorSet::calculateDominatorsFromBlock(BasicBlock *RootBB) {
// specified function. // specified function.
// //
bool DominatorSet::runOnFunction(Function &F) { bool DominatorSet::runOnFunction(Function &F) {
BasicBlock *Root = &F.getEntryNode(); BasicBlock *Root = &F.getEntryBlock();
Roots.clear(); Roots.clear();
Roots.push_back(Root); Roots.push_back(Root);
assert(pred_begin(Root) == pred_end(Root) && assert(pred_begin(Root) == pred_end(Root) &&

View File

@@ -228,7 +228,7 @@ void Verifier::visitFunction(Function &F) {
verifySymbolTable(F.getSymbolTable()); verifySymbolTable(F.getSymbolTable());
// Check the entry node // Check the entry node
BasicBlock *Entry = &F.getEntryNode(); BasicBlock *Entry = &F.getEntryBlock();
Assert1(pred_begin(Entry) == pred_end(Entry), Assert1(pred_begin(Entry) == pred_end(Entry),
"Entry block to function must not have predecessors!", Entry); "Entry block to function must not have predecessors!", Entry);
} }
@@ -482,7 +482,7 @@ void Verifier::visitInstruction(Instruction &I) {
// Use must be dominated by by definition unless use is unreachable! // Use must be dominated by by definition unless use is unreachable!
Assert2(DS->dominates(BB, Pred) || Assert2(DS->dominates(BB, Pred) ||
!DS->dominates(&BB->getParent()->getEntryNode(), Pred), !DS->dominates(&BB->getParent()->getEntryBlock(), Pred),
"Instruction does not dominate all uses!", "Instruction does not dominate all uses!",
&I, PN); &I, PN);
} }
@@ -490,7 +490,8 @@ void Verifier::visitInstruction(Instruction &I) {
} else { } else {
// Use must be dominated by by definition unless use is unreachable! // Use must be dominated by by definition unless use is unreachable!
Assert2(DS->dominates(&I, Use) || Assert2(DS->dominates(&I, Use) ||
!DS->dominates(&BB->getParent()->getEntryNode(),Use->getParent()), !DS->dominates(&BB->getParent()->getEntryBlock(),
Use->getParent()),
"Instruction does not dominate all uses!", &I, Use); "Instruction does not dominate all uses!", &I, Use);
} }
} }