commit f55922b8b8bb12a88738e04c81316dcefeda118d
author Anders Carlsson <andersca@mac.com> Thu Jul 23 04:59:05 2009 +0000
committer Anders Carlsson <andersca@mac.com> Thu Jul 23 04:59:05 2009 +0000
tree f32ec44538b04144d1199d194cfb0731b1d21f6f
parent 02def54fa1dbb930cce9e9c3574d4f8b3890e8a0

Set field info for unions.

llvm-svn: 76856

clang/lib/CodeGen/CGRecordLayoutBuilder.cpp

diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 1631c43..fa096bd 100644
--- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -151,6 +151,7 @@
   
   const ASTRecordLayout &Layout = Types.getContext().getASTRecordLayout(D);
   
+  const FieldDecl *FD = 0;
   const llvm::Type *Ty = 0;
   uint64_t Size = 0;
   unsigned Align = 0;
@@ -182,12 +183,21 @@
       Ty = FieldTy;
       Align = FieldAlign;
       Size = FieldSize;
+      FD = *Field;
     }
   }
   
   // Now add our field.
-  if (Ty)
+  if (FD) {
     AppendField(0, Size, Ty);
+    Types.addFieldInfo(FD, 0);
+    
+    if (FD->isBitField()) {
+      uint64_t FieldSize = 
+        FD->getBitWidth()->EvaluateAsInt(Types.getContext()).getZExtValue();
+      Types.addBitFieldInfo(FD, 0, FieldSize);
+    }
+  }
   
   // Append tail padding.
   if (Layout.getSize() / 8 > Size)