[cfe-commits] r65286 - /cfe/trunk/lib/CodeGen/CodeGenFunction.h

[Mike Stump]

Author: mrs
Date: Sun Feb 22 07:55:31 2009
New Revision: 65286

URL: http://llvm.org/viewvc/llvm-project?rev=65286&view=rev
Log:
Copy some clenaups from Eli to code that I copied.  :-)

Modified:
    cfe/trunk/lib/CodeGen/CodeGenFunction.h

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=65286&r1=65285&r2=65286&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Sun Feb 22 07:55:31 2009
@@ -293,12 +293,7 @@
   }
   uint64_t getBlockOffset(ValueDecl *D) {
     uint64_t Size = getContext().getTypeSize(D->getType()) / 8;
-
-    unsigned Align = getContext().getTypeAlign(D->getType());
-    if (const AlignedAttr* AA = D->getAttr<AlignedAttr>())
-        Align = std::max(Align, AA->getAlignment());
-
-    return getBlockOffset(Size, Align);
+    return getBlockOffset(Size, getContext().getDeclAlignInBytes(D)*8);
   }
   std::map<Decl*, uint64_t> BlockDecls;