diff options
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/var-align.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 0b7d30ac50..e5bd15e856 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -477,6 +477,12 @@ void CodeGenModule::EmitGlobalVarInit(const VarDecl *D) { "Initializer codegen type mismatch!"); GV->setInitializer(Init); + unsigned Align = Context.getTypeAlign(D->getType()); + if (const AlignedAttr* AA = D->getAttr<AlignedAttr>()) { + Align = std::max(Align, AA->getAlignment()); + } + GV->setAlignment(Align / 8); + if (const VisibilityAttr *attr = D->getAttr<VisibilityAttr>()) setVisibility(GV, attr->getVisibility()); // FIXME: else handle -fvisibility diff --git a/test/CodeGen/var-align.c b/test/CodeGen/var-align.c new file mode 100644 index 0000000000..be585c052e --- /dev/null +++ b/test/CodeGen/var-align.c @@ -0,0 +1,4 @@ +// RUN: clang -emit-llvm %s -o - | grep "align 16" | count 2 + +__attribute((aligned(16))) float a[128]; +union {int a[4]; __attribute((aligned(16))) float b[4];} u; |