Don't save an iterator, just use post-increment.

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

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 6f5b9d36edfa091b42478f0371672c1f35b50724..c0f0d1569bd7077d4968670a9a0454ab2d32a805 100644 (file)
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -472,10 +472,8 @@ Archive::findModulesDefiningSymbols(std::set<std::string>& symbols,
       result.insert(mp);
 
       // Remove the symbol now that its been resolved, being careful to 
-      // not invalidate our iterator.
-      std::set<std::string>::iterator save = I;
-      ++I;
-      symbols.erase(save);
+      // post-increment the iterator.
+      symbols.erase(I++);
     } else {
       ++I;
     }

diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 6f5b9d36edfa091b42478f0371672c1f35b50724..c0f0d1569bd7077d4968670a9a0454ab2d32a805 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -472,10 +472,8 @@ Archive::findModulesDefiningSymbols(std::set<std::string>& symbols,
       result.insert(mp);
 
       // Remove the symbol now that its been resolved, being careful to 
-      // not invalidate our iterator.
-      std::set<std::string>::iterator save = I;
-      ++I;
-      symbols.erase(save);
+      // post-increment the iterator.
+      symbols.erase(I++);
     } else {
       ++I;
     }