1 files changed, 6 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 =