commit e4d90e14841e1e2d94701f65ad3f23a223fdaaca
author Joao Matos <ripzonetriton@gmail.com> Fri Aug 31 17:28:09 2012 +0000
committer Joao Matos <ripzonetriton@gmail.com> Fri Aug 31 17:28:09 2012 +0000
tree aa338d0c461c9c1837b4a00bcb94a903267a3419
parent de5277fc555551857602bd7a7e5e616274e2d4a6

Fixed invalid iterators. Since the iterator is invalidated after the erase() call, we need to replace it with the new one returned. This was triggering an assert under MSVC 2012 and making all the ARCMT/ tests fail.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163007 91177308-0d34-0410-b5e6-96231b3b80d8

lib/ARCMigrate/ARCMT.cpp

diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp
index 14e13ba..9c4c2f2 100644
--- a/lib/ARCMigrate/ARCMT.cpp
+++ b/lib/ARCMigrate/ARCMT.cpp
@@ -42,7 +42,7 @@
       while (I != List.end() && I->getLevel() == DiagnosticsEngine::Note)
         ++I;
       // Clear the diagnostic and any notes following it.
-      List.erase(eraseS, I);
+      I = List.erase(eraseS, I);
       continue;
     }