diff options
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGen/align-local.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 4541fc4caa..8723a66872 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -129,8 +129,12 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) { if (!Target.useGlobalsForAutomaticVariables()) { // A normal fixed sized variable becomes an alloca in the entry block. const llvm::Type *LTy = ConvertType(Ty); - // TODO: Alignment - DeclPtr = CreateTempAlloca(LTy, D.getName()); + llvm::AllocaInst * Alloc = CreateTempAlloca(LTy, D.getName()); + unsigned align = getContext().getTypeAlign(Ty); + if (const AlignedAttr* AA = D.getAttr<AlignedAttr>()) + align = std::max(align, AA->getAlignment()); + Alloc->setAlignment(align >> 3); + DeclPtr = Alloc; } else { // Targets that don't support recursion emit locals as globals. const char *Class = diff --git a/test/CodeGen/align-local.c b/test/CodeGen/align-local.c new file mode 100644 index 0000000000..46f83fab8d --- /dev/null +++ b/test/CodeGen/align-local.c @@ -0,0 +1,8 @@ +// RUN: clang -emit-llvm < %s | grep "align 16" | count 2 + +typedef struct __attribute((aligned(16))) {int x[4];} ff; + +int a() { + ff a; + struct {int x[4];} b __attribute((aligned(16))); +} |