commit edb6f5dca102db69b932c98d51574db9ad4cd520
author Eli Friedman <eli.friedman@gmail.com> Fri Feb 10 02:02:21 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Feb 10 02:02:21 2012 +0000
tree 33a1200d91ea4f2ab0fb9407fdf84dfd27be9236
parent 9ef50bd66cbe18886958cfec560e4f4d680ad82a

Make sure we convert struct layout pragmas to attributes for class templates the same way we do for non-template classes.  <rdar://problem/10791194>.

llvm-svn: 150221

clang/lib/Sema/SemaTemplate.cpp

diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index ca34ada..af2c6ef 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -1023,6 +1023,11 @@
                                             NumOuterTemplateParamLists,
                                             OuterTemplateParamLists);
 
+  // Add alignment attributes if necessary; these attributes are checked when
+  // the ASTContext lays out the structure.
+  AddAlignmentAttributesForRecord(NewClass);
+  AddMsStructLayoutForRecord(NewClass);
+
   ClassTemplateDecl *NewTemplate
     = ClassTemplateDecl::Create(Context, SemanticContext, NameLoc,
                                 DeclarationName(Name), TemplateParams,