summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2015-07-07 17:12:14 +0000
committerAaron Ballman <aaron@aaronballman.com>2015-07-07 17:12:14 +0000
commit76413ecb607d71b800288c8114550d1e90cb0608 (patch)
tree28eb941223912d8bca7800b299ea33d88df8fb87 /clang
parentef888a4db60a8c1081169f8cf395d614623ec195 (diff)
downloadbcm5719-llvm-76413ecb607d71b800288c8114550d1e90cb0608.tar.gz
bcm5719-llvm-76413ecb607d71b800288c8114550d1e90cb0608.zip
Use AlignOf instead of alignOf so that this can go back to being a static_assert. Amends r241577.
llvm-svn: 241604
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/AST/DeclObjC.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
index d15cc88c39c..927988f960a 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<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);
OpenPOWER on IntegriCloud