diff options
author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-11-13 05:07:23 +0000 |
---|---|---|
committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-11-13 05:07:23 +0000 |
commit | 8682b93b3491facc9a42eb87b78bb9d8c18a0739 (patch) | |
tree | 2510346bd1133da1a698e10c9b829bd897e19357 /lib/Sema/SemaInit.cpp | |
parent | cbf5f60996fa2bd0ecd779b1472dc5cbad3ca464 (diff) |
Copy the decls returned by DeclContext::lookup_result to a
new container so we can safely iterate over them.
The container holding the lookup decls can under certain conditions
be changed while iterating (e.g. because of deserialization).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167816 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
-rw-r--r-- | lib/Sema/SemaInit.cpp | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 3596bbfc72..7ed3942332 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -2744,14 +2744,14 @@ static OverloadingResult ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, Expr **Args, unsigned NumArgs, OverloadCandidateSet &CandidateSet, - DeclContext::lookup_iterator Con, - DeclContext::lookup_iterator ConEnd, + ArrayRef<NamedDecl *> Ctors, OverloadCandidateSet::iterator &Best, bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, bool InitListSyntax) { CandidateSet.clear(); - for (; Con != ConEnd; ++Con) { + for (ArrayRef<NamedDecl *>::iterator + Con = Ctors.begin(), ConEnd = Ctors.end(); Con != ConEnd; ++Con) { NamedDecl *D = *Con; DeclAccessPair FoundDecl = DeclAccessPair::make(D, D->getAccess()); bool SuppressUserConversions = false; @@ -2844,6 +2844,10 @@ static void TryConstructorInitialization(Sema &S, // through overload resolution. DeclContext::lookup_iterator ConStart, ConEnd; llvm::tie(ConStart, ConEnd) = S.LookupConstructors(DestRecordDecl); + // The container holding the constructors can under certain conditions + // be changed while iterating (e.g. because of deserialization). + // To be safe we copy the lookup results to a new container. + SmallVector<NamedDecl*, 16> Ctors(ConStart, ConEnd); OverloadingResult Result = OR_No_Viable_Function; OverloadCandidateSet::iterator Best; @@ -2865,7 +2869,7 @@ static void TryConstructorInitialization(Sema &S, (!DestRecordDecl->hasDeclaredDefaultConstructor() && !DestRecordDecl->needsImplicitDefaultConstructor())) Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, NumArgs, - CandidateSet, ConStart, ConEnd, Best, + CandidateSet, Ctors, Best, CopyInitialization, AllowExplicit, /*OnlyListConstructor=*/true, InitListSyntax); @@ -2883,7 +2887,7 @@ static void TryConstructorInitialization(Sema &S, if (Result == OR_No_Viable_Function) { AsInitializerList = false; Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, NumArgs, - CandidateSet, ConStart, ConEnd, Best, + CandidateSet, Ctors, Best, CopyInitialization, AllowExplicit, /*OnlyListConstructors=*/false, InitListSyntax); @@ -3153,9 +3157,14 @@ static OverloadingResult TryRefInitWithConversionFunction(Sema &S, CXXRecordDecl *T1RecordDecl = cast<CXXRecordDecl>(T1RecordType->getDecl()); DeclContext::lookup_iterator Con, ConEnd; - for (llvm::tie(Con, ConEnd) = S.LookupConstructors(T1RecordDecl); - Con != ConEnd; ++Con) { - NamedDecl *D = *Con; + llvm::tie(Con, ConEnd) = S.LookupConstructors(T1RecordDecl); + // The container holding the constructors can under certain conditions + // be changed while iterating (e.g. because of deserialization). + // To be safe we copy the lookup results to a new container. + SmallVector<NamedDecl*, 16> Ctors(Con, ConEnd); + for (SmallVector<NamedDecl*, 16>::iterator + CI = Ctors.begin(), CE = Ctors.end(); CI != CE; ++CI) { + NamedDecl *D = *CI; DeclAccessPair FoundDecl = DeclAccessPair::make(D, D->getAccess()); // Find the constructor (which may be a template). @@ -4317,11 +4326,17 @@ static void LookupCopyAndMoveConstructors(Sema &S, CXXRecordDecl *Class, Expr *CurInitExpr) { DeclContext::lookup_iterator Con, ConEnd; - for (llvm::tie(Con, ConEnd) = S.LookupConstructors(Class); - Con != ConEnd; ++Con) { + llvm::tie(Con, ConEnd) = S.LookupConstructors(Class); + // The container holding the constructors can under certain conditions + // be changed while iterating (e.g. because of deserialization). + // To be safe we copy the lookup results to a new container. + SmallVector<NamedDecl*, 16> Ctors(Con, ConEnd); + for (SmallVector<NamedDecl*, 16>::iterator + CI = Ctors.begin(), CE = Ctors.end(); CI != CE; ++CI) { + NamedDecl *D = *CI; CXXConstructorDecl *Constructor = 0; - if ((Constructor = dyn_cast<CXXConstructorDecl>(*Con))) { + if ((Constructor = dyn_cast<CXXConstructorDecl>(D))) { // Handle copy/moveconstructors, only. if (!Constructor || Constructor->isInvalidDecl() || !Constructor->isCopyOrMoveConstructor() || @@ -4336,7 +4351,7 @@ static void LookupCopyAndMoveConstructors(Sema &S, } // Handle constructor templates. - FunctionTemplateDecl *ConstructorTmpl = cast<FunctionTemplateDecl>(*Con); + FunctionTemplateDecl *ConstructorTmpl = cast<FunctionTemplateDecl>(D); if (ConstructorTmpl->isInvalidDecl()) continue; |