replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use getABITypeSizeInBits() instead of getTypeSizeInBits() during struct layout. 

llvm-svn: 44799
This commit is contained in:
Devang Patel 2007-12-10 18:37:40 +00:00
parent bb5c0d8960
commit 3c31b54b47
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/CodeGen/CodeGenTypes.cpp
View File

@ -417,15 +417,15 @@ void RecordOrganizer::layoutStructFields(const ASTRecordLayout &RL) {
// struct { char A; short CurrentField:2; }; // struct { char A; short CurrentField:2; };
const llvm::Type *Ty = CGT.ConvertType(FD->getType()); const llvm::Type *Ty = CGT.ConvertType(FD->getType());
// Calculate extra bits available in this bitfield. // Calculate extra bits available in this bitfield.
ExtraBits = CGT.getTargetData().getTypeSizeInBits(Ty) - BitFieldSize; ExtraBits = CGT.getTargetData().getABITypeSizeInBits(Ty) - BitFieldSize;
if (LLVMFields.empty()) if (LLVMFields.empty())
// Ths is - struct { char CurrentField:2; char B:4; } // Ths is - struct { char CurrentField:2; char B:4; }
addLLVMField(Ty, BitFieldSize, FD, 0, ExtraBits); addLLVMField(Ty, BitFieldSize, FD, 0, ExtraBits);
else { else {
const llvm::Type *PrevTy = LLVMFields.back(); const llvm::Type *PrevTy = LLVMFields.back();
if (CGT.getTargetData().getTypeSizeInBits(PrevTy) >= if (CGT.getTargetData().getABITypeSizeInBits(PrevTy) >=
CGT.getTargetData().getTypeSizeInBits(Ty)) CGT.getTargetData().getABITypeSizeInBits(Ty))
// This is - struct { char A; char CurrentField:2; }; // This is - struct { char A; char CurrentField:2; };
addLLVMField(Ty, BitFieldSize, FD, 0, ExtraBits); addLLVMField(Ty, BitFieldSize, FD, 0, ExtraBits);
else { else {
@ -446,8 +446,8 @@ void RecordOrganizer::layoutStructFields(const ASTRecordLayout &RL) {
//ExtraBits are not enough to hold entire FD. //ExtraBits are not enough to hold entire FD.
const llvm::Type *Ty = CGT.ConvertType(FD->getType()); const llvm::Type *Ty = CGT.ConvertType(FD->getType());
const llvm::Type *PrevTy = LLVMFields.back(); const llvm::Type *PrevTy = LLVMFields.back();
uint64_t TySize = CGT.getTargetData().getTypeSizeInBits(Ty); uint64_t TySize = CGT.getTargetData().getABITypeSizeInBits(Ty);
if (CGT.getTargetData().getTypeSizeInBits(PrevTy) >= TySize) { if (CGT.getTargetData().getABITypeSizeInBits(PrevTy) >= TySize) {
// Previous field does not allow sharing of ExtraBits. Use new field. // Previous field does not allow sharing of ExtraBits. Use new field.
// struct { char a; char b:5; char c:4; } where c is current FD. // struct { char a; char b:5; char c:4; } where c is current FD.
Cursor += ExtraBits; Cursor += ExtraBits;
@ -472,7 +472,7 @@ void RecordOrganizer::addPaddingFields(unsigned RequiredBits) {
unsigned RequiredBytes = RequiredBits / 8; unsigned RequiredBytes = RequiredBits / 8;
for (unsigned i = 0; i != RequiredBytes; ++i) for (unsigned i = 0; i != RequiredBytes; ++i)
addLLVMField(llvm::Type::Int8Ty, addLLVMField(llvm::Type::Int8Ty,
CGT.getTargetData().getTypeSizeInBits(llvm::Type::Int8Ty)); CGT.getTargetData().getABITypeSizeInBits(llvm::Type::Int8Ty));
} }
/// addLLVMField - Add llvm struct field that corresponds to llvm type Ty. /// addLLVMField - Add llvm struct field that corresponds to llvm type Ty.