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 | 216f64379fc47f7a3803985fdee25a16abe6b570 (patch) | |
| tree | 16816fc0230dd9405d40c479d523546f46895306 /clang/lib/CodeGen/CodeGenModule.cpp | |
| parent | 3dd56f96c385f78905ebc73bbbff56c2b4615d7d (diff) | |
| download | bcm5719-llvm-216f64379fc47f7a3803985fdee25a16abe6b570.tar.gz bcm5719-llvm-216f64379fc47f7a3803985fdee25a16abe6b570.zip | |
Simplify.
llvm-svn: 64944
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index ba77e44288c..312eaad2974 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<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>()) |
