diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-07-13 01:19:08 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-07-13 01:19:08 +0000 |
| commit | d3d02dd0ae17eabc8e0b8972ac6a3863534b39d2 (patch) | |
| tree | 1078e8c7bb6724c5b7bfb45875d9715fc485526c /lib/Sema/SemaTemplate.cpp | |
| parent | abd56c816e9164b17bb3e7154a511b0c9896ffdb (diff) | |
Fix a bug in my previous commit. The problem is not that we were not using the
canonical decl for the template, but that we were not merging attributes for
templates at all!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160157 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 4605e01fa2..5d14d8762c 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -1134,6 +1134,9 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, NewTemplate->setInvalidDecl(); NewClass->setInvalidDecl(); } + if (PrevClassTemplate) + mergeDeclAttributes(NewClass, PrevClassTemplate->getTemplatedDecl()); + return NewTemplate; } |