diff --git a/llvm/include/llvm/PassManagers.h b/llvm/include/llvm/PassManagers.h index d7f3375dfe4b..5cbb77a77911 100644 --- a/llvm/include/llvm/PassManagers.h +++ b/llvm/include/llvm/PassManagers.h @@ -127,10 +127,10 @@ public: virtual void addTopLevelPass(Pass *P) = 0; /// Set pass P as the last user of the given analysis passes. - void setLastUser(std::vector &AnalysisPasses, Pass *P); + void setLastUser(SmallVector &AnalysisPasses, Pass *P); /// Collect passes whose last user is P - void collectLastUses(std::vector &LastUses, Pass *P); + void collectLastUses(SmallVector &LastUses, Pass *P); /// Find the pass that implements Analysis AID. Search immutable /// passes and all pass managers. If desired pass is not found diff --git a/llvm/lib/VMCore/PassManager.cpp b/llvm/lib/VMCore/PassManager.cpp index bf43bb1f8943..0cd1cfaa1177 100644 --- a/llvm/lib/VMCore/PassManager.cpp +++ b/llvm/lib/VMCore/PassManager.cpp @@ -381,10 +381,10 @@ PMTopLevelManager::PMTopLevelManager (enum TopLevelManagerType t) { } /// Set pass P as the last user of the given analysis passes. -void PMTopLevelManager::setLastUser(std::vector &AnalysisPasses, +void PMTopLevelManager::setLastUser(SmallVector &AnalysisPasses, Pass *P) { - for (std::vector::iterator I = AnalysisPasses.begin(), + for (SmallVector::iterator I = AnalysisPasses.begin(), E = AnalysisPasses.end(); I != E; ++I) { Pass *AP = *I; LastUser[AP] = P; @@ -403,7 +403,7 @@ void PMTopLevelManager::setLastUser(std::vector &AnalysisPasses, } /// Collect passes whose last user is P -void PMTopLevelManager::collectLastUses(std::vector &LastUses, +void PMTopLevelManager::collectLastUses(SmallVector &LastUses, Pass *P) { for (std::map::iterator LUI = LastUser.begin(), LUE = LastUser.end(); LUI != LUE; ++LUI) @@ -653,7 +653,7 @@ void PMDataManager::removeNotPreservedAnalysis(Pass *P) { void PMDataManager::removeDeadPasses(Pass *P, std::string Msg, enum PassDebuggingString DBG_STR) { - std::vector DeadPasses; + SmallVector DeadPasses; // If this is a on the fly manager then it does not have TPM. if (!TPM) @@ -661,7 +661,7 @@ void PMDataManager::removeDeadPasses(Pass *P, std::string Msg, TPM->collectLastUses(DeadPasses, P); - for (std::vector::iterator I = DeadPasses.begin(), + for (SmallVector::iterator I = DeadPasses.begin(), E = DeadPasses.end(); I != E; ++I) { dumpPassInfo(*I, FREEING_MSG, DBG_STR, Msg); @@ -691,12 +691,12 @@ void PMDataManager::add(Pass *P, // If a FunctionPass F is the last user of ModulePass info M // then the F's manager, not F, records itself as a last user of M. - std::vector TransferLastUses; + SmallVector TransferLastUses; if (ProcessAnalysis) { // At the moment, this pass is the last user of all required passes. - std::vector LastUses; + SmallVector LastUses; SmallVector RequiredPasses; SmallVector ReqAnalysisNotAvailable; @@ -827,7 +827,7 @@ Pass *PMDataManager::findAnalysisPass(AnalysisID AID, bool SearchParent) { // Print list of passes that are last used by P. void PMDataManager::dumpLastUses(Pass *P, unsigned Offset) const{ - std::vector LUses; + SmallVector LUses; // If this is a on the fly manager then it does not have TPM. if (!TPM) @@ -835,7 +835,7 @@ void PMDataManager::dumpLastUses(Pass *P, unsigned Offset) const{ TPM->collectLastUses(LUses, P); - for (std::vector::iterator I = LUses.begin(), + for (SmallVector::iterator I = LUses.begin(), E = LUses.end(); I != E; ++I) { llvm::cerr << "--" << std::string(Offset*2, ' '); (*I)->dumpPassStructure(0); @@ -1260,7 +1260,7 @@ void MPPassManager::addLowerLevelRequiredPass(Pass *P, Pass *RequiredPass) { FPP->add(RequiredPass); // Register P as the last user of RequiredPass. - std::vector LU; + SmallVector LU; LU.push_back(RequiredPass); FPP->setLastUser(LU, P); }