diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-08-11 23:26:42 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-08-11 23:26:42 +0000 |
| commit | 63ab2c54dc641d4f3d28841aa86affbfdf805d32 (patch) | |
| tree | 3088b156ad21217c6c5810b2be9f855a1df839a2 | |
| parent | 0a208183841082057343def56fcf8f2dc4da7edd (diff) | |
Fix a PCH crash bug where we kept a reference inside a DenseMap while the map was getting modified.
No test case, sorry. It's one of those bugs where it's really really hard to make one. rdar://9910862.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@137383 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Serialization/ASTReader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 490e5f9da2..1bda1ed42a 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -4307,7 +4307,10 @@ ASTReader::FindExternalVisibleDeclsByName(const DeclContext *DC, // There might be visible decls in multiple parts of the chain, for the TU // and namespaces. For any given name, the last available results replace // all earlier ones. For this reason, we walk in reverse. - DeclContextInfos &Infos = DeclContextOffsets[DC]; + // Copy the DeclContextInfos vector instead of using a reference to the + // vector stored in the map, because DeclContextOffsets can change while + // we load declarations with GetLocalDeclAs. + DeclContextInfos Infos = DeclContextOffsets[DC]; for (DeclContextInfos::reverse_iterator I = Infos.rbegin(), E = Infos.rend(); I != E; ++I) { if (!I->NameLookupTableData) |