From: Aaron Ballman <aaron@aaronballman.com>
Date: Tue, 7 Jul 2015 17:12:14 +0000 (+0000)
Subject: Use AlignOf instead of alignOf so that this can go back to being a static_assert... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a4b27a329e6f190bbd1b1fb5b4820c9abc5eade;p=clang

Use AlignOf instead of alignOf so that this can go back to being a static_assert. Amends r241577.

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

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index d15cc88c39..927988f960 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -1266,9 +1266,9 @@ ObjCTypeParamList *ObjCTypeParamList::create(
                      SourceLocation rAngleLoc) {
   unsigned size = sizeof(ObjCTypeParamList)
                 + sizeof(ObjCTypeParamDecl *) * typeParams.size();
-  assert(llvm::alignOf<ObjCTypeParamList>() >=
-             llvm::alignOf<ObjCTypeParamDecl *>() &&
-         "type parameter list needs greater alignment");
+  static_assert(llvm::AlignOf<ObjCTypeParamList>::Alignment >=
+                    llvm::AlignOf<ObjCTypeParamDecl *>::Alignment,
+                "type parameter list needs greater alignment");
   unsigned align = llvm::alignOf<ObjCTypeParamList>();
   void *mem = ctx.Allocate(size, align);
   return new (mem) ObjCTypeParamList(lAngleLoc, typeParams, rAngleLoc);