if (AI) {
std::vector<AllocaInst*> Allocas;
Allocas.push_back(AI);
- PromoteMemToReg(Allocas, *ET, *DF, CurAST);
+ PromoteMemToReg(Allocas, *DT, *DF, CurAST);
}
}
}
PromotedAllocas.reserve(PromotedValues.size());
for (unsigned i = 0, e = PromotedValues.size(); i != e; ++i)
PromotedAllocas.push_back(PromotedValues[i].first);
- PromoteMemToReg(PromotedAllocas, *ET, *DF, CurAST);
+ PromoteMemToReg(PromotedAllocas, *DT, *DF, CurAST);
}
/// FindPromotableValuesInLoop - Check the current loop for stores to definite
// getAnalysisUsage - This pass does not require any passes, but we know it
// will not alter the CFG, so say so.
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<ETForest>();
+ AU.addRequired<DominatorTree>();
AU.addRequired<DominanceFrontier>();
AU.addRequired<TargetData>();
AU.setPreservesCFG();
bool SROA::performPromotion(Function &F) {
std::vector<AllocaInst*> Allocas;
- ETForest &ET = getAnalysis<ETForest>();
+ DominatorTree &DT = getAnalysis<DominatorTree>();
DominanceFrontier &DF = getAnalysis<DominanceFrontier>();
BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function
if (Allocas.empty()) break;
- PromoteMemToReg(Allocas, ET, DF);
+ PromoteMemToReg(Allocas, DT, DF);
NumPromoted += Allocas.size();
Changed = true;
}
// getAnalysisUsage - We need dominance frontiers
//
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<ETForest>();
+ AU.addRequired<DominatorTree>();
AU.addRequired<DominanceFrontier>();
AU.setPreservesCFG();
// This is a cluster of orthogonal Transforms
bool Changed = false;
- ETForest &ET = getAnalysis<ETForest>();
+ DominatorTree &DT = getAnalysis<DominatorTree>();
DominanceFrontier &DF = getAnalysis<DominanceFrontier>();
while (1) {
if (Allocas.empty()) break;
- PromoteMemToReg(Allocas, ET, DF);
+ PromoteMemToReg(Allocas, DT, DF);
NumPromoted += Allocas.size();
Changed = true;
}
///
std::vector<AllocaInst*> Allocas;
SmallVector<AllocaInst*, 16> &RetryList;
- ETForest &ET;
+ DominatorTree &DT;
DominanceFrontier &DF;
/// AST - An AliasSetTracker object to update. If null, don't update it.
public:
PromoteMem2Reg(const std::vector<AllocaInst*> &A,
- SmallVector<AllocaInst*, 16> &Retry, ETForest &et,
+ SmallVector<AllocaInst*, 16> &Retry, DominatorTree &dt,
DominanceFrontier &df, AliasSetTracker *ast)
- : Allocas(A), RetryList(Retry), ET(et), DF(df), AST(ast) {}
+ : Allocas(A), RetryList(Retry), DT(dt), DF(df), AST(ast) {}
void run();
bool properlyDominates(Instruction *I1, Instruction *I2) const {
if (InvokeInst *II = dyn_cast<InvokeInst>(I1))
I1 = II->getNormalDest()->begin();
- return ET.properlyDominates(I1->getParent(), I2->getParent());
+ return DT.properlyDominates(I1->getParent(), I2->getParent());
}
- /// dominates - Return true if BB1 dominates BB2 using the ETForest.
+ /// dominates - Return true if BB1 dominates BB2 using the DominatorTree.
///
bool dominates(BasicBlock *BB1, BasicBlock *BB2) const {
- return ET.dominates(BB1, BB2);
+ return DT.dominates(BB1, BB2);
}
private:
SmallPtrSet<PHINode*, 16> &DeadPHINodes) {
// Scan the immediate dominators of this block looking for a block which has a
// PHI node for Alloca num. If we find it, mark the PHI node as being alive!
- for (BasicBlock* DomBB = BB; DomBB; DomBB = ET.getIDom(DomBB)) {
+ DomTreeNode *IDomNode = DT.getNode(BB);
+ for (DomTreeNode *IDom = IDomNode; IDom; IDom = IDom->getIDom()) {
+ BasicBlock *DomBB = IDom->getBlock();
DenseMap<std::pair<BasicBlock*, unsigned>, PHINode*>::iterator
I = NewPhiNodes.find(std::make_pair(DomBB, AllocaNum));
if (I != NewPhiNodes.end()) {
/// made to the IR.
///
void llvm::PromoteMemToReg(const std::vector<AllocaInst*> &Allocas,
- ETForest &ET, DominanceFrontier &DF,
+ DominatorTree &DT, DominanceFrontier &DF,
AliasSetTracker *AST) {
// If there is nothing to do, bail out...
if (Allocas.empty()) return;
SmallVector<AllocaInst*, 16> RetryList;
- PromoteMem2Reg(Allocas, RetryList, ET, DF, AST).run();
+ PromoteMem2Reg(Allocas, RetryList, DT, DF, AST).run();
// PromoteMem2Reg may not have been able to promote all of the allocas in one
// pass, run it again if needed.
NewAllocas.assign(RetryList.begin(), RetryList.end());
RetryList.clear();
- PromoteMem2Reg(NewAllocas, RetryList, ET, DF, AST).run();
+ PromoteMem2Reg(NewAllocas, RetryList, DT, DF, AST).run();
NewAllocas.clear();
}
}