forked from OSchip/llvm-project
While calculating original type size for a derived type, handle type variants encoded as DIDerivedType appropriately.
This improves bitfield support. llvm-svn: 86073
This commit is contained in:
parent
a5beced60e
commit
f05d57283e
|
@ -401,12 +401,18 @@ bool DIVariable::Verify() const {
|
|||
/// getOriginalTypeSize - If this type is derived from a base type then
|
||||
/// return base type size.
|
||||
uint64_t DIDerivedType::getOriginalTypeSize() const {
|
||||
DIType BT = getTypeDerivedFrom();
|
||||
if (!BT.isNull() && BT.isDerivedType())
|
||||
return DIDerivedType(BT.getNode()).getOriginalTypeSize();
|
||||
if (BT.isNull())
|
||||
return getSizeInBits();
|
||||
return BT.getSizeInBits();
|
||||
unsigned Tag = getTag();
|
||||
if (Tag == dwarf::DW_TAG_member || Tag == dwarf::DW_TAG_typedef ||
|
||||
Tag == dwarf::DW_TAG_const_type || Tag == dwarf::DW_TAG_volatile_type ||
|
||||
Tag == dwarf::DW_TAG_restrict_type) {
|
||||
DIType BaseType = getTypeDerivedFrom();
|
||||
if (BaseType.isDerivedType())
|
||||
return DIDerivedType(BaseType.getNode()).getOriginalTypeSize();
|
||||
else
|
||||
return BaseType.getSizeInBits();
|
||||
}
|
||||
|
||||
return getSizeInBits();
|
||||
}
|
||||
|
||||
/// describes - Return true if this subprogram provides debugging
|
||||
|
|
|
@ -1141,9 +1141,7 @@ DIE *DwarfDebug::CreateMemberDIE(CompileUnit *DW_Unit, const DIDerivedType &DT){
|
|||
AddUInt(MemLocationDie, 0, dwarf::DW_FORM_data1, dwarf::DW_OP_plus_uconst);
|
||||
|
||||
uint64_t Size = DT.getSizeInBits();
|
||||
uint64_t FieldSize = Size;
|
||||
if (DT.getTypeDerivedFrom().getTag() != dwarf::DW_TAG_array_type)
|
||||
FieldSize = DT.getOriginalTypeSize();
|
||||
uint64_t FieldSize = DT.getOriginalTypeSize();
|
||||
|
||||
if (Size != FieldSize) {
|
||||
// Handle bitfield.
|
||||
|
|
Loading…
Reference in New Issue