From 76413ecb607d71b800288c8114550d1e90cb0608 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Tue, 7 Jul 2015 17:12:14 +0000 Subject: [PATCH] Use AlignOf instead of alignOf so that this can go back to being a static_assert. Amends r241577. llvm-svn: 241604 --- clang/lib/AST/DeclObjC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index d15cc88c39c3..927988f960ad 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -1266,9 +1266,9 @@ ObjCTypeParamList *ObjCTypeParamList::create( SourceLocation rAngleLoc) { unsigned size = sizeof(ObjCTypeParamList) + sizeof(ObjCTypeParamDecl *) * typeParams.size(); - assert(llvm::alignOf() >= - llvm::alignOf() && - "type parameter list needs greater alignment"); + static_assert(llvm::AlignOf::Alignment >= + llvm::AlignOf::Alignment, + "type parameter list needs greater alignment"); unsigned align = llvm::alignOf(); void *mem = ctx.Allocate(size, align); return new (mem) ObjCTypeParamList(lAngleLoc, typeParams, rAngleLoc);