using namespace llvm;
-void ModulePassManager::run() {
- for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
- if (Passes[Idx]->run(M))
- if (AM) AM->invalidateAll(M);
+PreservedAnalyses ModulePassManager::run(Module *M, ModuleAnalysisManager *AM) {
+ PreservedAnalyses PA = PreservedAnalyses::all();
+ for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx) {
+ PreservedAnalyses PassPA = Passes[Idx]->run(M, AM);
+ if (AM)
+ AM->invalidate(M, PassPA);
+ PA.intersect(llvm_move(PassPA));
+ }
+ return PA;
}
-bool FunctionPassManager::run(Module *M) {
- bool Changed = false;
- for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
- for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
- if (Passes[Idx]->run(I)) {
- Changed = true;
- if (AM) AM->invalidateAll(I);
- }
- return Changed;
-}
+const ModuleAnalysisManager::ResultConceptT &
+ModuleAnalysisManager::getResultImpl(void *PassID, Module *M) {
+ ModuleAnalysisResultMapT::iterator RI;
+ bool Inserted;
+ llvm::tie(RI, Inserted) = ModuleAnalysisResults.insert(std::make_pair(
+ PassID, polymorphic_ptr<detail::AnalysisResultConcept<Module *> >()));
-void AnalysisManager::invalidateAll(Function *F) {
- assert(F->getParent() == M && "Invalidating a function from another module!");
+ // If we don't have a cached result for this module, look up the pass and run
+ // it to produce a result, which we then add to the cache.
+ if (Inserted)
+ RI->second = lookupPass(PassID).run(M, this);
- // First invalidate any module results we still have laying about.
- // FIXME: This is a total hack based on the fact that erasure doesn't
- // invalidate iteration for DenseMap.
- for (ModuleAnalysisResultMapT::iterator I = ModuleAnalysisResults.begin(),
- E = ModuleAnalysisResults.end();
- I != E; ++I)
- if (I->second->invalidate(M))
- ModuleAnalysisResults.erase(I);
+ return *RI->second;
+}
- // Now clear all the invalidated results associated specifically with this
- // function.
- SmallVector<void *, 8> InvalidatedPassIDs;
- FunctionAnalysisResultListT &ResultsList = FunctionAnalysisResultLists[F];
- for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
- E = ResultsList.end();
- I != E; ++I)
- if (I->second->invalidate(F)) {
- FunctionAnalysisResultListT::iterator Old = I--;
- InvalidatedPassIDs.push_back(Old->first);
- ResultsList.erase(Old);
- }
- while (!InvalidatedPassIDs.empty())
- FunctionAnalysisResults.erase(
- std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
+const ModuleAnalysisManager::ResultConceptT *
+ModuleAnalysisManager::getCachedResultImpl(void *PassID, Module *M) const {
+ ModuleAnalysisResultMapT::const_iterator RI = ModuleAnalysisResults.find(PassID);
+ return RI == ModuleAnalysisResults.end() ? 0 : &*RI->second;
}
-void AnalysisManager::invalidateAll(Module *M) {
- // First invalidate any module results we still have laying about.
+void ModuleAnalysisManager::invalidateImpl(void *PassID, Module *M) {
+ ModuleAnalysisResults.erase(PassID);
+}
+
+void ModuleAnalysisManager::invalidateImpl(Module *M,
+ const PreservedAnalyses &PA) {
// FIXME: This is a total hack based on the fact that erasure doesn't
// invalidate iteration for DenseMap.
for (ModuleAnalysisResultMapT::iterator I = ModuleAnalysisResults.begin(),
E = ModuleAnalysisResults.end();
I != E; ++I)
- if (I->second->invalidate(M))
+ if (I->second->invalidate(M, PA))
ModuleAnalysisResults.erase(I);
-
- // Now walk all of the functions for which there are cached results, and
- // attempt to invalidate each of those as the entire module may have changed.
- // FIXME: How do we handle functions which have been deleted or RAUWed?
- SmallVector<void *, 8> InvalidatedPassIDs;
- for (FunctionAnalysisResultListMapT::iterator
- FI = FunctionAnalysisResultLists.begin(),
- FE = FunctionAnalysisResultLists.end();
- FI != FE; ++FI) {
- Function *F = FI->first;
- FunctionAnalysisResultListT &ResultsList = FI->second;
- for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
- E = ResultsList.end();
- I != E; ++I)
- if (I->second->invalidate(F)) {
- FunctionAnalysisResultListT::iterator Old = I--;
- InvalidatedPassIDs.push_back(Old->first);
- ResultsList.erase(Old);
- }
- while (!InvalidatedPassIDs.empty())
- FunctionAnalysisResults.erase(
- std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
- }
}
-const AnalysisManager::AnalysisResultConcept<Module> &
-AnalysisManager::getResultImpl(void *PassID, Module *M) {
- assert(M == this->M && "Wrong module used when querying the AnalysisManager");
- ModuleAnalysisResultMapT::iterator RI;
- bool Inserted;
- llvm::tie(RI, Inserted) = ModuleAnalysisResults.insert(std::make_pair(
- PassID, polymorphic_ptr<AnalysisResultConcept<Module> >()));
-
- if (Inserted) {
- // We don't have a cached result for this result. Look up the pass and run
- // it to produce a result, which we then add to the cache.
- ModuleAnalysisPassMapT::const_iterator PI =
- ModuleAnalysisPasses.find(PassID);
- assert(PI != ModuleAnalysisPasses.end() &&
- "Analysis passes must be registered prior to being queried!");
- RI->second = PI->second->run(M);
+PreservedAnalyses FunctionPassManager::run(Function *F, FunctionAnalysisManager *AM) {
+ PreservedAnalyses PA = PreservedAnalyses::all();
+ for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx) {
+ PreservedAnalyses PassPA = Passes[Idx]->run(F, AM);
+ if (AM)
+ AM->invalidate(F, PassPA);
+ PA.intersect(llvm_move(PassPA));
}
+ return PA;
+}
- return *RI->second;
+bool FunctionAnalysisManager::empty() const {
+ assert(FunctionAnalysisResults.empty() ==
+ FunctionAnalysisResultLists.empty() &&
+ "The storage and index of analysis results disagree on how many there "
+ "are!");
+ return FunctionAnalysisResults.empty();
}
-const AnalysisManager::AnalysisResultConcept<Function> &
-AnalysisManager::getResultImpl(void *PassID, Function *F) {
- assert(F->getParent() == M && "Analyzing a function from another module!");
+void FunctionAnalysisManager::clear() {
+ FunctionAnalysisResults.clear();
+ FunctionAnalysisResultLists.clear();
+}
+const FunctionAnalysisManager::ResultConceptT &
+FunctionAnalysisManager::getResultImpl(void *PassID, Function *F) {
FunctionAnalysisResultMapT::iterator RI;
bool Inserted;
llvm::tie(RI, Inserted) = FunctionAnalysisResults.insert(std::make_pair(
std::make_pair(PassID, F), FunctionAnalysisResultListT::iterator()));
+ // If we don't have a cached result for this function, look up the pass and
+ // run it to produce a result, which we then add to the cache.
if (Inserted) {
- // We don't have a cached result for this result. Look up the pass and run
- // it to produce a result, which we then add to the cache.
- FunctionAnalysisPassMapT::const_iterator PI =
- FunctionAnalysisPasses.find(PassID);
- assert(PI != FunctionAnalysisPasses.end() &&
- "Analysis passes must be registered prior to being queried!");
FunctionAnalysisResultListT &ResultList = FunctionAnalysisResultLists[F];
- ResultList.push_back(std::make_pair(PassID, PI->second->run(F)));
+ ResultList.push_back(std::make_pair(PassID, lookupPass(PassID).run(F, this)));
RI->second = llvm::prior(ResultList.end());
}
return *RI->second->second;
}
-void AnalysisManager::invalidateImpl(void *PassID, Module *M) {
- assert(M == this->M && "Invalidating a pass over a different module!");
- ModuleAnalysisResults.erase(PassID);
+const FunctionAnalysisManager::ResultConceptT *
+FunctionAnalysisManager::getCachedResultImpl(void *PassID, Function *F) const {
+ FunctionAnalysisResultMapT::const_iterator RI =
+ FunctionAnalysisResults.find(std::make_pair(PassID, F));
+ return RI == FunctionAnalysisResults.end() ? 0 : &*RI->second->second;
}
-void AnalysisManager::invalidateImpl(void *PassID, Function *F) {
- assert(F->getParent() == M &&
- "Invalidating a pass over a function from another module!");
-
+void FunctionAnalysisManager::invalidateImpl(void *PassID, Function *F) {
FunctionAnalysisResultMapT::iterator RI =
FunctionAnalysisResults.find(std::make_pair(PassID, F));
if (RI == FunctionAnalysisResults.end())
FunctionAnalysisResultLists[F].erase(RI->second);
}
+
+void FunctionAnalysisManager::invalidateImpl(Function *F,
+ const PreservedAnalyses &PA) {
+ // Clear all the invalidated results associated specifically with this
+ // function.
+ SmallVector<void *, 8> InvalidatedPassIDs;
+ FunctionAnalysisResultListT &ResultsList = FunctionAnalysisResultLists[F];
+ for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
+ E = ResultsList.end();
+ I != E;)
+ if (I->second->invalidate(F, PA)) {
+ InvalidatedPassIDs.push_back(I->first);
+ I = ResultsList.erase(I);
+ } else {
+ ++I;
+ }
+ while (!InvalidatedPassIDs.empty())
+ FunctionAnalysisResults.erase(
+ std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
+}
+
+char FunctionAnalysisManagerModuleProxy::PassID;
+
+FunctionAnalysisManagerModuleProxy::Result
+FunctionAnalysisManagerModuleProxy::run(Module *M) {
+ assert(FAM.empty() && "Function analyses ran prior to the module proxy!");
+ return Result(FAM);
+}
+
+FunctionAnalysisManagerModuleProxy::Result::~Result() {
+ // Clear out the analysis manager if we're being destroyed -- it means we
+ // didn't even see an invalidate call when we got invalidated.
+ FAM.clear();
+}
+
+bool FunctionAnalysisManagerModuleProxy::Result::invalidate(
+ Module *M, const PreservedAnalyses &PA) {
+ // If this proxy isn't marked as preserved, then we can't even invalidate
+ // individual function analyses, there may be an invalid set of Function
+ // objects in the cache making it impossible to incrementally preserve them.
+ // Just clear the entire manager.
+ if (!PA.preserved(ID()))
+ FAM.clear();
+
+ // Return false to indicate that this result is still a valid proxy.
+ return false;
+}
+
+char ModuleAnalysisManagerFunctionProxy::PassID;
projects / oota-llvm.git / blobdiff