From: Daniel Dunbar Date: Wed, 18 Feb 2009 19:45:21 +0000 (+0000) Subject: Simplify. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aee306b1c653bc7d86ae6cb2b905e8b8d0ac27f;p=clang Simplify. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64944 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index ba77e44288..312eaad297 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/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())