Changes in directory llvm/lib/Transforms/Utils:
PromoteMemoryToRegister.cpp updated: 1.89 -> 1.90 --- Log message: Switch InsertedPHINodes back to SmallPtrSet now that the SmallPtrSet::erase bug is fixed. --- Diffs of the changes: (+6 -6) PromoteMemoryToRegister.cpp | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) Index: llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp diff -u llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.89 llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.90 --- llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.89 Mon Feb 5 16:28:52 2007 +++ llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp Mon Feb 5 17:11:37 2007 @@ -115,7 +115,7 @@ private: void MarkDominatingPHILive(BasicBlock *BB, unsigned AllocaNum, - std::set<PHINode*> &DeadPHINodes); + SmallPtrSet<PHINode*, 16> &DeadPHINodes); bool PromoteLocallyUsedAlloca(BasicBlock *BB, AllocaInst *AI); void PromoteLocallyUsedAllocas(BasicBlock *BB, const std::vector<AllocaInst*> &AIs); @@ -123,7 +123,7 @@ void RenamePass(BasicBlock *BB, BasicBlock *Pred, std::vector<Value*> &IncVals); bool QueuePhiNode(BasicBlock *BB, unsigned AllocaIdx, unsigned &Version, - std::set<PHINode*> &InsertedPHINodes); + SmallPtrSet<PHINode*, 16> &InsertedPHINodes); }; } // end of anonymous namespace @@ -271,7 +271,7 @@ // dominance frontier of EACH basic-block we have a write in. // unsigned CurrentVersion = 0; - std::set<PHINode*> InsertedPHINodes; + SmallPtrSet<PHINode*, 16> InsertedPHINodes; std::vector<unsigned> DFBlocks; while (!DefiningBlocks.empty()) { BasicBlock *BB = DefiningBlocks.back(); @@ -315,7 +315,7 @@ UsingBlocks.clear(); // If there are any PHI nodes which are now known to be dead, remove them! - for (std::set<PHINode*>::iterator I = InsertedPHINodes.begin(), + for (SmallPtrSet<PHINode*, 16>::iterator I = InsertedPHINodes.begin(), E = InsertedPHINodes.end(); I != E; ++I) { PHINode *PN = *I; std::vector<PHINode*> &BBPNs = NewPhiNodes[PN->getParent()]; @@ -489,7 +489,7 @@ // DeadPHINodes set are removed. // void PromoteMem2Reg::MarkDominatingPHILive(BasicBlock *BB, unsigned AllocaNum, - std::set<PHINode*> &DeadPHINodes) { + 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 (DominatorTree::Node *N = DT[BB]; N; N = N->getIDom()) { @@ -630,7 +630,7 @@ // bool PromoteMem2Reg::QueuePhiNode(BasicBlock *BB, unsigned AllocaNo, unsigned &Version, - std::set<PHINode*> &InsertedPHINodes) { + SmallPtrSet<PHINode*, 16> &InsertedPHINodes) { // Look up the basic-block in question. std::vector<PHINode*> &BBPNs = NewPhiNodes[BB]; if (BBPNs.empty()) BBPNs.resize(Allocas.size()); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits