From 216f64379fc47f7a3803985fdee25a16abe6b570 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 18 Feb 2009 19:45:21 +0000 Subject: Simplify. llvm-svn: 64944 --- clang/lib/CodeGen/CodeGenModule.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index ba77e44288ca..312eaad2974e 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -683,9 +683,8 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) { Align = Context.getTypeAlign(IAT->getElementType()); else Align = Context.getTypeAlign(D->getType()); - if (const AlignedAttr* AA = D->getAttr()) { + if (const AlignedAttr* AA = D->getAttr()) Align = std::max(Align, AA->getAlignment()); - } GV->setAlignment(Align / 8); if (const VisibilityAttr *attr = D->getAttr()) -- cgit v1.2.3