mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-18 12:29:21 +00:00
Use ETForest instead of DominatorTree.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36252 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
9e7919785e
commit
fb4b3d117f
@ -224,14 +224,12 @@ namespace {
|
||||
std::map<Value*, unsigned> RankMap;
|
||||
std::map<BasicBlock*, RegionInfo> RegionInfoMap;
|
||||
ETForest *EF;
|
||||
DominatorTree *DT;
|
||||
public:
|
||||
virtual bool runOnFunction(Function &F);
|
||||
|
||||
// We don't modify the program, so we preserve all analyses
|
||||
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
|
||||
AU.addRequired<ETForest>();
|
||||
AU.addRequired<DominatorTree>();
|
||||
AU.addRequiredID(BreakCriticalEdgesID);
|
||||
};
|
||||
|
||||
@ -302,7 +300,6 @@ bool CEE::runOnFunction(Function &F) {
|
||||
// tree. Note that our traversal will not even touch unreachable basic
|
||||
// blocks.
|
||||
EF = &getAnalysis<ETForest>();
|
||||
DT = &getAnalysis<DominatorTree>();
|
||||
|
||||
std::set<BasicBlock*> VisitedBlocks;
|
||||
bool Changed = TransformRegion(&F.getEntryBlock(), VisitedBlocks);
|
||||
@ -349,13 +346,15 @@ bool CEE::TransformRegion(BasicBlock *BB, std::set<BasicBlock*> &VisitedBlocks){
|
||||
// blocks that are dominated by this one, we can safely propagate the
|
||||
// information down now.
|
||||
//
|
||||
DominatorTree::Node *BBN = (*DT)[BB];
|
||||
if (!RI.empty()) // Time opt: only propagate if we can change something
|
||||
for (unsigned i = 0, e = BBN->getChildren().size(); i != e; ++i) {
|
||||
BasicBlock *Dominated = BBN->getChildren()[i]->getBlock();
|
||||
assert(RegionInfoMap.find(Dominated) == RegionInfoMap.end() &&
|
||||
std::vector<BasicBlock*> children;
|
||||
EF->getChildren(BB, children);
|
||||
if (!RI.empty()) { // Time opt: only propagate if we can change something
|
||||
for (std::vector<BasicBlock*>::iterator CI = children.begin(), E = children.end();
|
||||
CI != E; ++CI) {
|
||||
assert(RegionInfoMap.find(*CI) == RegionInfoMap.end() &&
|
||||
"RegionInfo should be calculated in dominanace order!");
|
||||
getRegionInfo(Dominated) = RI;
|
||||
getRegionInfo(*CI) = RI;
|
||||
}
|
||||
}
|
||||
|
||||
// Now that all of our successors have information if they deserve it,
|
||||
@ -379,8 +378,9 @@ bool CEE::TransformRegion(BasicBlock *BB, std::set<BasicBlock*> &VisitedBlocks){
|
||||
}
|
||||
|
||||
// Now that all of our successors have information, recursively process them.
|
||||
for (unsigned i = 0, e = BBN->getChildren().size(); i != e; ++i)
|
||||
Changed |= TransformRegion(BBN->getChildren()[i]->getBlock(),VisitedBlocks);
|
||||
for (std::vector<BasicBlock*>::iterator CI = children.begin(), E = children.end();
|
||||
CI != E; ++CI)
|
||||
Changed |= TransformRegion(*CI, VisitedBlocks);
|
||||
|
||||
return Changed;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user