diff options
| -rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 25 | ||||
| -rw-r--r-- | test/CodeGenCXX/bitfield-layout.cpp | 34 |
2 files changed, 40 insertions, 19 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 215b39e743..71dca504c5 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -161,21 +161,16 @@ static CGBitFieldInfo ComputeBitFieldInfo(CodeGenTypes &Types, bool IsSigned = FD->getType()->isSignedIntegerType(); if (FieldSize > TypeSizeInBits) { - // We have a wide bit-field. - - CGBitFieldInfo::AccessInfo Component; - - Component.FieldIndex = 0; - Component.FieldByteOffset = - TypeSizeInBytes * ((FieldOffset / 8) / TypeSizeInBytes); - Component.FieldBitStart = 0; - Component.AccessWidth = TypeSizeInBits; - // FIXME: This might be wrong! - Component.AccessAlignment = 0; - Component.TargetBitOffset = 0; - Component.TargetBitWidth = TypeSizeInBits; - - return CGBitFieldInfo(TypeSizeInBits, 1, &Component, IsSigned); + // We have a wide bit-field. The extra bits are only used for padding, so + // if we have a bitfield of type T, with size N: + // + // T t : N; + // + // We can just assume that it's: + // + // T t : sizeof(T); + // + FieldSize = TypeSizeInBits; } unsigned StartBit = FieldOffset % TypeSizeInBits; diff --git a/test/CodeGenCXX/bitfield-layout.cpp b/test/CodeGenCXX/bitfield-layout.cpp index 94250195f5..15f33d2765 100644 --- a/test/CodeGenCXX/bitfield-layout.cpp +++ b/test/CodeGenCXX/bitfield-layout.cpp @@ -1,17 +1,43 @@ -// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -O3 | FileCheck -check-prefix LP64 %s +// RUN: %clang_cc1 %s -triple=i386-apple-darwin10 -emit-llvm -o - -O3 | FileCheck -check-prefix LP32 %s -// CHECK: %union.Test1 = type { i32, [4 x i8] } +// CHECK-LP64: %union.Test1 = type { i32, [4 x i8] } union Test1 { int a; int b: 39; } t1; -// CHECK: %union.Test2 = type { i8 } +// CHECK-LP64: %union.Test2 = type { i8 } union Test2 { int : 6; } t2; -// CHECK: %union.Test3 = type { [2 x i8] } +// CHECK-LP64: %union.Test3 = type { [2 x i8] } union Test3 { int : 9; } t3; + + +#define CHECK(x) if (!(x)) return __LINE__ + +int f() { + struct { + int a; + + unsigned long long b : 65; + + int c; + } c; + + c.a = 0; + c.b = (unsigned long long)-1; + c.c = 0; + + CHECK(c.a == 0); + CHECK(c.b == (unsigned long long)-1); + CHECK(c.c == 0); + +// CHECK-LP64: ret i32 0 +// CHECK-LP32: ret i32 0 + return 0; +} |