diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-04-08 02:59:45 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-04-08 02:59:45 +0000 |
| commit | 7f2896406c8f14bf123578610043a919ba1a1c8a (patch) | |
| tree | b9001dacc3b1f0e7ec68cd0b35d843b70ed19f9b /lib/CodeGen/CGRecordLayoutBuilder.cpp | |
| parent | 4f4fd92c6c64ecbc65507f63ddd09211f732622c (diff) | |
IRgen: Move the bit-field access type into CGBitFieldInfo, and change bit-field LValues to just store the base address of object containing the bit-field.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100745 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGRecordLayoutBuilder.cpp')
| -rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 4b9ec66e17..fdd8d05926 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -180,7 +180,7 @@ void CGRecordLayoutBuilder::LayoutBitField(const FieldDecl *D, bool IsSigned = D->getType()->isSignedIntegerType(); LLVMBitFields.push_back(LLVMBitFieldInfo( - D, CGBitFieldInfo(FieldOffset / TypeSizeInBits, + D, CGBitFieldInfo(Ty, FieldOffset / TypeSizeInBits, FieldOffset % TypeSizeInBits, FieldSize, IsSigned))); @@ -270,6 +270,8 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { FieldEnd = D->field_end(); Field != FieldEnd; ++Field, ++FieldNo) { assert(Layout.getFieldOffset(FieldNo) == 0 && "Union field offset did not start at the beginning of record!"); + const llvm::Type *FieldTy = + Types.ConvertTypeForMemRecursive(Field->getType()); if (Field->isBitField()) { uint64_t FieldSize = @@ -282,7 +284,7 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { // Add the bit field info. bool IsSigned = Field->getType()->isSignedIntegerType(); LLVMBitFields.push_back(LLVMBitFieldInfo( - *Field, CGBitFieldInfo(0, 0, FieldSize, + *Field, CGBitFieldInfo(FieldTy, 0, 0, FieldSize, IsSigned))); } else { LLVMFields.push_back(LLVMFieldInfo(*Field, 0)); @@ -290,8 +292,6 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { HasOnlyZeroSizedBitFields = false; - const llvm::Type *FieldTy = - Types.ConvertTypeForMemRecursive(Field->getType()); unsigned FieldAlign = Types.getTargetData().getABITypeAlignment(FieldTy); uint64_t FieldSize = Types.getTargetData().getTypeAllocSize(FieldTy); |