commit faaec2234f21bf175dd05c723072202cdf39cb2f
author Anders Carlsson <andersca@mac.com> Thu Jul 23 21:16:33 2009 +0000
committer Anders Carlsson <andersca@mac.com> Thu Jul 23 21:16:33 2009 +0000
tree 6786920699ff1b37825f2e6cfbbfdc0e583f4c38
parent ec586e7b10394aeed25c8e5ee02d230951826136

Correct a  thinko in bitfield layout code. Fixes PR4611.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76898 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGRecordLayoutBuilder.cpp

diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 2d10b1f..455b929 100644
--- a/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -88,10 +88,8 @@
   
   AppendBytes(NumBytesToAppend);
   
-  if (!NumBytesToAppend)
-    BitsAvailableInLastField -= FieldSize;
-  else
-    BitsAvailableInLastField = NumBytesToAppend * 8 - FieldSize;
+  BitsAvailableInLastField = 
+    getNextFieldOffsetInBytes() * 8 - (FieldOffset + FieldSize);
 }
 
 bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D,