commit 1a30edb995924b007044ca7abd97d7fbea22007f
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Aug 16 22:51:34 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Aug 16 22:51:34 2012 +0000
tree 6c3999f195777543478ef57c65ac68a47604523b
parent 2f648515c8bf964c87eb3b6ce37bb816d7d9b2bc

Fix misaligned allocation of TemplateParameterList objects.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162056 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclTemplate.cpp

diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp
index 5aebc2b..a7e8999 100644
--- a/lib/AST/DeclTemplate.cpp
+++ b/lib/AST/DeclTemplate.cpp
@@ -43,7 +43,8 @@
                               unsigned NumParams, SourceLocation RAngleLoc) {
   unsigned Size = sizeof(TemplateParameterList) 
                 + sizeof(NamedDecl *) * NumParams;
-  unsigned Align = llvm::AlignOf<TemplateParameterList>::Alignment;
+  unsigned Align = std::max(llvm::alignOf<TemplateParameterList>(),
+                            llvm::alignOf<NamedDecl*>());
   void *Mem = C.Allocate(Size, Align);
   return new (Mem) TemplateParameterList(TemplateLoc, LAngleLoc, Params,
                                          NumParams, RAngleLoc);