diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-11-15 21:56:44 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-11-15 21:56:44 +0000 |
| commit | 8c60bc92117ef426d473683fe92fbdde8e4d0111 (patch) | |
| tree | d23357b5b69b6360e3a524d5f0f7a9bbf051724f /llvm/lib/IR/PassManager.cpp | |
| parent | 1205a6c0c157815ba6cdbf748d6b36aa03b3bebf (diff) | |
| download | llvm-8c60bc92117ef426d473683fe92fbdde8e4d0111.zip llvm-8c60bc92117ef426d473683fe92fbdde8e4d0111.tar.gz llvm-8c60bc92117ef426d473683fe92fbdde8e4d0111.tar.bz2 | |
[PM] Fix an iterator problem spotted by the MSVC debug iterators and
AaronBallman. Thanks for the excellent review.
llvm-svn: 194857
Diffstat (limited to 'llvm/lib/IR/PassManager.cpp')
| -rw-r--r-- | llvm/lib/IR/PassManager.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/IR/PassManager.cpp b/llvm/lib/IR/PassManager.cpp index f706a0d..966af7de 100644 --- a/llvm/lib/IR/PassManager.cpp +++ b/llvm/lib/IR/PassManager.cpp @@ -47,11 +47,12 @@ void AnalysisManager::invalidateAll(Function *F) { FunctionAnalysisResultListT &ResultsList = FunctionAnalysisResultLists[F]; for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(), E = ResultsList.end(); - I != E; ++I) + I != E;) if (I->second->invalidate(F)) { - FunctionAnalysisResultListT::iterator Old = I--; - InvalidatedPassIDs.push_back(Old->first); - ResultsList.erase(Old); + InvalidatedPassIDs.push_back(I->first); + I = ResultsList.erase(I); + } else { + ++I; } while (!InvalidatedPassIDs.empty()) FunctionAnalysisResults.erase( @@ -80,11 +81,12 @@ void AnalysisManager::invalidateAll(Module *M) { FunctionAnalysisResultListT &ResultsList = FI->second; for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(), E = ResultsList.end(); - I != E; ++I) + I != E;) if (I->second->invalidate(F)) { - FunctionAnalysisResultListT::iterator Old = I--; - InvalidatedPassIDs.push_back(Old->first); - ResultsList.erase(Old); + InvalidatedPassIDs.push_back(I->first); + I = ResultsList.erase(I); + } else { + ++I; } while (!InvalidatedPassIDs.empty()) FunctionAnalysisResults.erase( |