diff options
author | David Blaikie <dblaikie@gmail.com> | 2012-10-18 16:57:32 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2012-10-18 16:57:32 +0000 |
commit | 12be639dfcc17a10957f79b0e650ec7455cf50f6 (patch) | |
tree | caddbf225fd10a266a95b52eef4c1c2b877e0f7a /clang/lib/Sema/SemaInit.cpp | |
parent | a0ca6601bc814e4b248eb473e7cfcd91844ccee2 (diff) | |
download | bcm5719-llvm-12be639dfcc17a10957f79b0e650ec7455cf50f6.tar.gz bcm5719-llvm-12be639dfcc17a10957f79b0e650ec7455cf50f6.zip |
PR14021: Copy lookup results to ensure safe iteration.
Within the body of the loop the underlying map may be modified via
Sema::AddOverloadCandidate
-> Sema::CompareReferenceRelationship
-> Sema::RequireCompleteType
to avoid the use of invalid iterators the sequence is copied first.
A reliable, though large, test case is available - it will be reduced and
committed shortly.
Patch by Robert Muth. Review by myself, Nico Weber, and Rafael Espindola.
llvm-svn: 166188
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index ec25d531136..3596bbfc725 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -3700,8 +3700,14 @@ static void TryUserDefinedConversion(Sema &S, // Try to complete the type we're converting to. if (!S.RequireCompleteType(Kind.getLocation(), DestType, 0)) { - DeclContext::lookup_iterator Con, ConEnd; - for (llvm::tie(Con, ConEnd) = S.LookupConstructors(DestRecordDecl); + DeclContext::lookup_iterator ConOrig, ConEndOrig; + llvm::tie(ConOrig, ConEndOrig) = S.LookupConstructors(DestRecordDecl); + // The container holding the constructors can under certain conditions + // be changed while iterating. To be safe we copy the lookup results + // to a new container. + SmallVector<NamedDecl*, 8> CopyOfCon(ConOrig, ConEndOrig); + for (SmallVector<NamedDecl*, 8>::iterator + Con = CopyOfCon.begin(), ConEnd = CopyOfCon.end(); Con != ConEnd; ++Con) { NamedDecl *D = *Con; DeclAccessPair FoundDecl = DeclAccessPair::make(D, D->getAccess()); |