diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-10 17:17:51 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-10 17:17:51 +0000 |
| commit | c72f348e95ced873b69abde93040060a12a1a3a6 (patch) | |
| tree | 03ae4eb8fe0bde3870e44cad2c4bd35a270cc965 /include/clang/AST/DeclTemplate.h | |
| parent | 27fe8790f1e12d29a15188192f52f2ac3e4fd672 (diff) | |
[Sema] Fix a multiple definition bug with friends and templates
The problem was that MergeFunctionDecl sometimes needs the injected template
arguments of a FunctionTemplateDecl, but is called before adding the new
template to the redecl chain. This leads to multiple common pointers in the same
redecl chain, each with their own identical instantiation. Fix this by merging
the the common state before inserting the new template into the redecl chain.
rdar://44810129
Differential revision: https://reviews.llvm.org/D53046
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@344157 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/AST/DeclTemplate.h')
| -rw-r--r-- | include/clang/AST/DeclTemplate.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h index e0ea7cb8b1..ee9be2ebd0 100644 --- a/include/clang/AST/DeclTemplate.h +++ b/include/clang/AST/DeclTemplate.h @@ -1093,6 +1093,9 @@ public: /// template. ArrayRef<TemplateArgument> getInjectedTemplateArgs(); + /// Merge our RedeclarableTemplateDecl::Common with \param Prev. + void mergePrevDecl(FunctionTemplateDecl *Prev); + /// Create a function template node. static FunctionTemplateDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L, |