From fdf496cb4807647276ad43f9c4ae5aa30bad299c Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 28 Mar 2014 23:32:39 +0000 Subject: PR19278: Align ASTTemplateArgumentListInfo to match its following dynamic array of TemplateArgumentLocs. 'uint64_t' has higher alignment requirements than a pointer on some platforms. llvm-svn: 205068 --- clang/include/clang/AST/TemplateBase.h | 3 ++- clang/lib/AST/TemplateBase.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'clang') diff --git a/clang/include/clang/AST/TemplateBase.h b/clang/include/clang/AST/TemplateBase.h index 7810c306dd9..abe106cb4e1 100644 --- a/clang/include/clang/AST/TemplateBase.h +++ b/clang/include/clang/AST/TemplateBase.h @@ -567,7 +567,8 @@ struct ASTTemplateArgumentListInfo { /// Force ASTTemplateArgumentListInfo to the right alignment /// for the following array of TemplateArgumentLocs. - void *Aligner; + llvm::AlignedCharArray< + llvm::AlignOf::Alignment, 1> Aligner; }; /// \brief Retrieve the template arguments diff --git a/clang/lib/AST/TemplateBase.cpp b/clang/lib/AST/TemplateBase.cpp index 16efb790b68..b068ffafef5 100644 --- a/clang/lib/AST/TemplateBase.cpp +++ b/clang/lib/AST/TemplateBase.cpp @@ -511,6 +511,8 @@ const DiagnosticBuilder &clang::operator<<(const DiagnosticBuilder &DB, const ASTTemplateArgumentListInfo * ASTTemplateArgumentListInfo::Create(ASTContext &C, const TemplateArgumentListInfo &List) { + assert(llvm::alignOf() >= + llvm::alignOf()); std::size_t size = ASTTemplateArgumentListInfo::sizeFor(List.size()); void *Mem = C.Allocate(size, llvm::alignOf()); ASTTemplateArgumentListInfo *TAI = new (Mem) ASTTemplateArgumentListInfo(); -- cgit v1.2.3