diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-07-23 21:16:33 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-07-23 21:16:33 +0000 |
| commit | 516e5e7835332802dc4cac8f3ab968a40feccbaf (patch) | |
| tree | fcdbaca322d92017e96d5926f73c394b077de759 | |
| parent | 2a5b83c7e6c1019cecefed1f5d14280b3b358287 (diff) | |
| download | bcm5719-llvm-516e5e7835332802dc4cac8f3ab968a40feccbaf.tar.gz bcm5719-llvm-516e5e7835332802dc4cac8f3ab968a40feccbaf.zip | |
Correct a thinko in bitfield layout code. Fixes PR4611.
llvm-svn: 76898
| -rw-r--r-- | clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGen/PR4611-bitfield-layout.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp index 2d10b1f030a..455b92996a9 100644 --- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -88,10 +88,8 @@ void CGRecordLayoutBuilder::LayoutBitField(const FieldDecl *D, AppendBytes(NumBytesToAppend); - if (!NumBytesToAppend) - BitsAvailableInLastField -= FieldSize; - else - BitsAvailableInLastField = NumBytesToAppend * 8 - FieldSize; + BitsAvailableInLastField = + getNextFieldOffsetInBytes() * 8 - (FieldOffset + FieldSize); } bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D, diff --git a/clang/test/CodeGen/PR4611-bitfield-layout.c b/clang/test/CodeGen/PR4611-bitfield-layout.c new file mode 100644 index 00000000000..ef698d5ab37 --- /dev/null +++ b/clang/test/CodeGen/PR4611-bitfield-layout.c @@ -0,0 +1,6 @@ +// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o %t && +// RUN: grep "struct.object_entry = type <{ i8, i8, i8, i8 }>" %t + +struct object_entry { + unsigned int type:3, pack_id:16, depth:13; +} entries; |
