maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Argyrios Kyrtzidis 2013-01-16 17:42:07 +00:00
parent 949e82216c
commit 8078a5a449
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Serialization/ASTReader.cpp
View File

@ -6854,11 +6854,13 @@ void ASTReader::finishPendingActions() {
// Note that new macros may be added while deserializing a macro. // Note that new macros may be added while deserializing a macro.
for (unsigned I = 0; I != PendingMacroIDs.size(); ++I) { for (unsigned I = 0; I != PendingMacroIDs.size(); ++I) {
PendingMacroIDsMap::iterator PMIt = PendingMacroIDs.begin() + 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 for (SmallVectorImpl<serialization::MacroID>::iterator
MIt = MacroIDs.begin(), ME = MacroIDs.end(); MIt != ME; ++MIt) { MIt = MacroIDs.begin(), ME = MacroIDs.end(); MIt != ME; ++MIt) {
MacroInfo *MI = getMacro(*MIt); MacroInfo *MI = getMacro(*MIt);
PP.addLoadedMacroInfo(PMIt->first, MI); PP.addLoadedMacroInfo(II, MI);
} }
} }
PendingMacroIDs.clear(); PendingMacroIDs.clear();