diff options
| -rw-r--r-- | include/llvm/Transforms/Utils/SSAUpdater.h | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/SSAUpdater.cpp | 42 |
2 files changed, 25 insertions, 19 deletions
diff --git a/include/llvm/Transforms/Utils/SSAUpdater.h b/include/llvm/Transforms/Utils/SSAUpdater.h index f353840cd5..f550d0285b 100644 --- a/include/llvm/Transforms/Utils/SSAUpdater.h +++ b/include/llvm/Transforms/Utils/SSAUpdater.h @@ -110,7 +110,7 @@ private: void FindAvailableVal(BasicBlock *BB, BBInfo *Info, unsigned Counter); void FindExistingPHI(BasicBlock *BB, BBInfo *Info); bool CheckIfPHIMatches(BasicBlock *BB, BBInfo *Info, Value *Val); - void RecordMatchingPHI(BasicBlock *BB, BBInfo *Info, PHINode *PHI); + void RecordMatchingPHI(PHINode *PHI); void ClearPHITags(PHINode *PHI); void operator=(const SSAUpdater&); // DO NOT IMPLEMENT diff --git a/lib/Transforms/Utils/SSAUpdater.cpp b/lib/Transforms/Utils/SSAUpdater.cpp index a8fbf6f414..4460381b30 100644 --- a/lib/Transforms/Utils/SSAUpdater.cpp +++ b/lib/Transforms/Utils/SSAUpdater.cpp @@ -406,7 +406,7 @@ void SSAUpdater::FindExistingPHI(BasicBlock *BB, BBInfo *Info) { for (BasicBlock::iterator It = BB->begin(); (SomePHI = dyn_cast<PHINode>(It)); ++It) { if (CheckIfPHIMatches(BB, Info, SomePHI)) { - RecordMatchingPHI(BB, Info, SomePHI); + RecordMatchingPHI(SomePHI); break; } ClearPHITags(SomePHI); @@ -449,25 +449,31 @@ bool SSAUpdater::CheckIfPHIMatches(BasicBlock *BB, BBInfo *Info, Value *Val) { return IsMatch; } -/// RecordMatchingPHI - For a PHI node that matches, record it in both the -/// BBMap and the AvailableVals mapping. Recursively record its input PHIs -/// as well. -void SSAUpdater::RecordMatchingPHI(BasicBlock *BB, BBInfo *Info, PHINode *PHI) { - if (!Info || Info->AvailableVal) - return; - - // Record the PHI. +/// RecordMatchingPHI - For a PHI node that matches, record it and its input +/// PHIs in both the BBMap and the AvailableVals mapping. +void SSAUpdater::RecordMatchingPHI(PHINode *PHI) { + BBMapTy *BBMap = getBBMap(BM); AvailableValsTy &AvailableVals = getAvailableVals(AV); - AvailableVals[BB] = PHI; - Info->AvailableVal = PHI; + SmallVector<PHINode*, 20> WorkList; + WorkList.push_back(PHI); - // Iterate through the predecessors. - BBMapTy *BBMap = getBBMap(BM); - for (unsigned i = 0, e = PHI->getNumIncomingValues(); i != e; ++i) { - PHINode *PHIVal = dyn_cast<PHINode>(PHI->getIncomingValue(i)); - if (!PHIVal) continue; - BasicBlock *Pred = PHIVal->getParent(); - RecordMatchingPHI(Pred, (*BBMap)[Pred], PHIVal); + while (!WorkList.empty()) { + PHI = WorkList.pop_back_val(); + BasicBlock *BB = PHI->getParent(); + BBInfo *Info = (*BBMap)[BB]; + if (!Info || Info->AvailableVal) + return; + + // Record the PHI. + AvailableVals[BB] = PHI; + Info->AvailableVal = PHI; + + // Iterate through the PHI's incoming values. + for (unsigned i = 0, e = PHI->getNumIncomingValues(); i != e; ++i) { + PHINode *IncomingVal = dyn_cast<PHINode>(PHI->getIncomingValue(i)); + if (!IncomingVal) continue; + WorkList.push_back(IncomingVal); + } } } |