[llvm-branch-commits] [cfe-branch] r81036 - in /cfe/branches/release_26: lib/CodeGen/CGRecordLayoutBuilder.cpp test/CodeGen/packed-union.c

[Tanya Lattner]

Author: tbrethou
Date: Fri Sep  4 15:02:56 2009
New Revision: 81036

URL: http://llvm.org/viewvc/llvm-project?rev=81036&view=rev
Log:
Merge 80808 from mainline.
Packed unions should be packed. Fixes an assert Daniel reported.

Added:
    cfe/branches/release_26/test/CodeGen/packed-union.c
      - copied unchanged from r80808, cfe/trunk/test/CodeGen/packed-union.c
Modified:
    cfe/branches/release_26/lib/CodeGen/CGRecordLayoutBuilder.cpp

Modified: cfe/branches/release_26/lib/CodeGen/CGRecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_26/lib/CodeGen/CGRecordLayoutBuilder.cpp?rev=81036&r1=81035&r2=81036&view=diff

==============================================================================
--- cfe/branches/release_26/lib/CodeGen/CGRecordLayoutBuilder.cpp (original)
+++ cfe/branches/release_26/lib/CodeGen/CGRecordLayoutBuilder.cpp Fri Sep  4 15:02:56 2009
@@ -28,14 +28,13 @@
 
 void CGRecordLayoutBuilder::Layout(const RecordDecl *D) {
   Alignment = Types.getContext().getASTRecordLayout(D).getAlignment() / 8;
+  Packed = D->hasAttr<PackedAttr>();
 
   if (D->isUnion()) {
     LayoutUnion(D);
     return;
   }
 
-  Packed = D->hasAttr<PackedAttr>();
-  
   if (LayoutFields(D))
     return;