[PCH/Modules] The iterator may become invalidated because a new macro can be added

while deserializing a macro, make sure to copy/move what we need from it.

Fixes clang-x86_64-debian-fast bot.

llvm-svn: 172629

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 5b1c5cd..d71bce5 100644 (file)
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -6854,11 +6854,13 @@ void ASTReader::finishPendingActions() {
     // Note that new macros may be added while deserializing a macro.
     for (unsigned I = 0; I != PendingMacroIDs.size(); ++I) {
       PendingMacroIDsMap::iterator PMIt = PendingMacroIDs.begin() + I;
-      SmallVector<serialization::MacroID, 2> &MacroIDs = PMIt->second;
+      IdentifierInfo *II = PMIt->first;
+      SmallVector<serialization::MacroID, 2> MacroIDs;
+      MacroIDs.swap(PMIt->second);
       for (SmallVectorImpl<serialization::MacroID>::iterator
              MIt = MacroIDs.begin(), ME = MacroIDs.end(); MIt != ME; ++MIt) {
         MacroInfo *MI = getMacro(*MIt);
-        PP.addLoadedMacroInfo(PMIt->first, MI);
+        PP.addLoadedMacroInfo(II, MI);
       }
     }
     PendingMacroIDs.clear();