diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index ea69a66..0ca2ad3 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -172,10 +172,7 @@
       const llvm::Type *LTy = ConvertType(Ty);
       llvm::AllocaInst *Alloc =
         CreateTempAlloca(LTy, CGM.getMangledName(&D));
-      unsigned align = getContext().getTypeAlign(Ty);
-      if (const AlignedAttr* AA = D.getAttr<AlignedAttr>())
-        align = std::max(align, AA->getAlignment());
-      Alloc->setAlignment(align >> 3);
+      Alloc->setAlignment(getContext().getDeclAlignInBytes(&D));
       DeclPtr = Alloc;
     } else {
       // Targets that don't support recursion emit locals as globals.