diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-02-18 19:45:21 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-02-18 19:45:21 +0000 |
| commit | 6aee306b1c653bc7d86ae6cb2b905e8b8d0ac27f (patch) | |
| tree | 2dd433b1ae73e5790482b4cd0bd7da64d5fadd59 /lib/CodeGen/CodeGenModule.cpp | |
| parent | 443e53c7845f01c8ed693ccd137abb0bd76564f6 (diff) | |
Simplify.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64944 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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<AlignedAttr>()) { + if (const AlignedAttr* AA = D->getAttr<AlignedAttr>()) Align = std::max(Align, AA->getAlignment()); - } GV->setAlignment(Align / 8); if (const VisibilityAttr *attr = D->getAttr<VisibilityAttr>()) |