commit d3d02dd0ae17eabc8e0b8972ac6a3863534b39d2
author Rafael Espindola <rafael.espindola@gmail.com> Fri Jul 13 01:19:08 2012 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Jul 13 01:19:08 2012 +0000
tree 1078e8c7bb6724c5b7bfb45875d9715fc485526c
parent abd56c816e9164b17bb3e7154a511b0c9896ffdb

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

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 4605e01..5d14d87 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1134,6 +1134,9 @@
     NewTemplate->setInvalidDecl();
     NewClass->setInvalidDecl();
   }
+  if (PrevClassTemplate)
+    mergeDeclAttributes(NewClass, PrevClassTemplate->getTemplatedDecl());
+
   return NewTemplate;
 }