From e75a64f2d32a20b82b992ef8d5d0899d12f9fabe Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Wed, 31 Mar 2010 00:55:13 +0000
Subject: CGRecordLayoutBuilder: Switch unions to use same mechanism for
 tracking field and bit-field info as structs.  - Anders, please check.

llvm-svn: 99977
---
 clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'clang/lib')

diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
index a87c8bcbbc2..3ddf1b58d5a 100644
--- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -288,9 +288,10 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) {
         continue;
 
       // Add the bit field info.
-      Types.addBitFieldInfo(*Field, 0, 0, FieldSize);
-    } else
-      Types.addFieldInfo(*Field, 0);
+      LLVMBitFields.push_back(LLVMBitFieldInfo(*Field, 0, 0, FieldSize));
+    } else {
+      LLVMFields.push_back(LLVMFieldInfo(*Field, 0));
+    }
 
     HasOnlyZeroSizedBitFields = false;
 
-- 
cgit v1.2.3