This is an archive of the discontinued LLVM Phabricator instance.

Differential D41874

[CodeView] Class record member counts should include base classes and virtual base classes
ClosedPublic

Authored by bwyma on Jan 9 2018, 11:40 AM.

Details

Reviewers
aaboud
rnk
Commits
rG4536c1f5695b: [CodeView] Class record member counts should include base classes and ...
rL324000: [CodeView] Class record member counts should include base classes and ...
Summary

As the FIXME in vftables.ll suggests the member count for class records is incorrect. The member count should also include the base classes and virtual base classes present in the field list to match what Visual Studio is doing.

`

FieldList (0x1018) {
  TypeLeafKind: LF_FIELDLIST (0x1203)
  BaseClass { ... }             # 1
  BaseClass { ... }             # 2
  DataMember { ... }            # 3
  OneMethod { ... }             # 4     
  OneMethod { ... }             # 5
} 
Struct (0x1019) { 
  TypeLeafKind: LF_STRUCTURE (0x1505) 
  MemberCount: 5                        # SHOULD BE "5", NOT "3"
  FieldList: <field list> (0x1018) 
  ...
}

`

Diff Detail

Repository
rL LLVM

Event Timeline

bwyma created this revision.Jan 9 2018, 11:40 AM
rnk accepted this revision.Jan 17 2018, 10:15 AM

lgtm

This revision is now accepted and ready to land.Jan 17 2018, 10:15 AM
Closed by commit rL324000: [CodeView] Class record member counts should include base classes and ... (authored by bwyma). · Explain WhyFeb 1 2018, 12:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
CodeGen/
AsmPrinter/
2 lines
test/
DebugInfo/
COFF/
2 lines
6 lines

Diff 132454

llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

Show First 20 Lines • Show All 1,964 Lines • ▼ Show 20 Lines if (I->getFlags() & DINode::FlagVirtual) {
? TypeRecordKind::IndirectVirtualBaseClass ? TypeRecordKind::IndirectVirtualBaseClass
: TypeRecordKind::VirtualBaseClass; : TypeRecordKind::VirtualBaseClass;
VirtualBaseClassRecord VBCR( VirtualBaseClassRecord VBCR(
RecordKind, translateAccessFlags(Ty->getTag(), I->getFlags()), RecordKind, translateAccessFlags(Ty->getTag(), I->getFlags()),
getTypeIndex(I->getBaseType()), getVBPTypeIndex(), VBPtrOffset, getTypeIndex(I->getBaseType()), getVBPTypeIndex(), VBPtrOffset,
VBTableIndex); VBTableIndex);
ContinuationBuilder.writeMemberType(VBCR); ContinuationBuilder.writeMemberType(VBCR);
MemberCount++;
} else { } else {
assert(I->getOffsetInBits() % 8 == 0 && assert(I->getOffsetInBits() % 8 == 0 &&
"bases must be on byte boundaries"); "bases must be on byte boundaries");
BaseClassRecord BCR(translateAccessFlags(Ty->getTag(), I->getFlags()), BaseClassRecord BCR(translateAccessFlags(Ty->getTag(), I->getFlags()),
getTypeIndex(I->getBaseType()), getTypeIndex(I->getBaseType()),
I->getOffsetInBits() / 8); I->getOffsetInBits() / 8);
ContinuationBuilder.writeMemberType(BCR); ContinuationBuilder.writeMemberType(BCR);
MemberCount++;
} }
} }
// Create members. // Create members.
for (ClassInfo::MemberInfo &MemberInfo : Info.Members) { for (ClassInfo::MemberInfo &MemberInfo : Info.Members) {
const DIDerivedType *Member = MemberInfo.MemberTypeNode; const DIDerivedType *Member = MemberInfo.MemberTypeNode;
TypeIndex MemberBaseType = getTypeIndex(Member->getBaseType()); TypeIndex MemberBaseType = getTypeIndex(Member->getBaseType());
StringRef MemberName = Member->getName(); StringRef MemberName = Member->getName();
▲ Show 20 Lines • Show All 491 Lines • Show Last 20 Lines

llvm/trunk/test/DebugInfo/COFF/types-data-members.ll

Show First 20 Lines • Show All 292 Lines • ▼ Show 20 Lines
; CHECK: AccessSpecifier: Public (0x3) ; CHECK: AccessSpecifier: Public (0x3)
; CHECK: Type: int (0x74) ; CHECK: Type: int (0x74)
; CHECK: FieldOffset: 0x18 ; CHECK: FieldOffset: 0x18
; CHECK: Name: d ; CHECK: Name: d
; CHECK: } ; CHECK: }
; CHECK: } ; CHECK: }
; CHECK: Struct (0x1016) { ; CHECK: Struct (0x1016) {
; CHECK: TypeLeafKind: LF_STRUCTURE (0x1505) ; CHECK: TypeLeafKind: LF_STRUCTURE (0x1505)
; CHECK: MemberCount: 2 ; CHECK: MemberCount: 4
; CHECK: Properties [ (0x200) ; CHECK: Properties [ (0x200)
; CHECK: HasUniqueName (0x200) ; CHECK: HasUniqueName (0x200)
; CHECK: ] ; CHECK: ]
; CHECK: FieldList: <field list> (0x1015) ; CHECK: FieldList: <field list> (0x1015)
; CHECK: DerivedFrom: 0x0 ; CHECK: DerivedFrom: 0x0
; CHECK: VShape: 0x0 ; CHECK: VShape: 0x0
; CHECK: SizeOf: 48 ; CHECK: SizeOf: 48
; CHECK: Name: DerivedClass ; CHECK: Name: DerivedClass
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines

llvm/trunk/test/DebugInfo/COFF/vftables.ll

Show First 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
; CHECK-NEXT: BaseClass { ; CHECK-NEXT: BaseClass {
; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400) ; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400)
; CHECK-NEXT: AccessSpecifier: Public (0x3) ; CHECK-NEXT: AccessSpecifier: Public (0x3)
; CHECK-NEXT: BaseType: B ; CHECK-NEXT: BaseType: B
; CHECK-NEXT: BaseOffset: 0x10 ; CHECK-NEXT: BaseOffset: 0x10
; CHECK-NEXT: } ; CHECK-NEXT: }
; CHECK-NOT: VFPtr ; CHECK-NOT: VFPtr
; FIXME: Is the MemberCount correct?
; CHECK: Struct ({{.*}}) { ; CHECK: Struct ({{.*}}) {
; CHECK-NEXT: TypeLeafKind: LF_STRUCTURE (0x1505) ; CHECK-NEXT: TypeLeafKind: LF_STRUCTURE (0x1505)
; CHECK-NEXT: MemberCount: 3 ; CHECK-NEXT: MemberCount: 5
; CHECK-NEXT: Properties [ (0x200) ; CHECK-NEXT: Properties [ (0x200)
; CHECK-NEXT: HasUniqueName (0x200) ; CHECK-NEXT: HasUniqueName (0x200)
; CHECK-NEXT: ] ; CHECK-NEXT: ]
; CHECK-NEXT: FieldList: <field list> ([[c_members]]) ; CHECK-NEXT: FieldList: <field list> ([[c_members]])
; CHECK-NEXT: DerivedFrom: 0x0 ; CHECK-NEXT: DerivedFrom: 0x0
; CHECK-NEXT: VShape: <vftable 1 methods> ([[vshape_1]]) ; CHECK-NEXT: VShape: <vftable 1 methods> ([[vshape_1]])
; CHECK-NEXT: SizeOf: 40 ; CHECK-NEXT: SizeOf: 40
; CHECK-NEXT: Name: C ; CHECK-NEXT: Name: C
; CHECK-NEXT: LinkageName: .?AUC@@ ; CHECK-NEXT: LinkageName: .?AUC@@
; CHECK-NEXT: } ; CHECK-NEXT: }
; CHECK: FieldList ([[d_members:0x[A-Z0-9]+]]) { ; CHECK: FieldList ([[d_members:0x[A-Z0-9]+]]) {
; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203) ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)
; CHECK-NEXT: BaseClass { ; CHECK-NEXT: BaseClass {
; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400) ; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400)
; CHECK-NEXT: AccessSpecifier: Public (0x3) ; CHECK-NEXT: AccessSpecifier: Public (0x3)
; CHECK-NEXT: BaseType: C ; CHECK-NEXT: BaseType: C
; CHECK-NEXT: BaseOffset: 0x0 ; CHECK-NEXT: BaseOffset: 0x0
; CHECK-NEXT: } ; CHECK-NEXT: }
; CHECK-NOT: VFPtr ; CHECK-NOT: VFPtr
; CHECK: Struct ({{.*}}) { ; CHECK: Struct ({{.*}}) {
; CHECK-NEXT: TypeLeafKind: LF_STRUCTURE (0x1505) ; CHECK-NEXT: TypeLeafKind: LF_STRUCTURE (0x1505)
; CHECK-NEXT: MemberCount: 3 ; CHECK-NEXT: MemberCount: 4
; CHECK-NEXT: Properties [ (0x200) ; CHECK-NEXT: Properties [ (0x200)
; CHECK-NEXT: HasUniqueName (0x200) ; CHECK-NEXT: HasUniqueName (0x200)
; CHECK-NEXT: ] ; CHECK-NEXT: ]
; CHECK-NEXT: FieldList: <field list> ([[d_members]]) ; CHECK-NEXT: FieldList: <field list> ([[d_members]])
; CHECK-NEXT: DerivedFrom: 0x0 ; CHECK-NEXT: DerivedFrom: 0x0
; CHECK-NEXT: VShape: <vftable 1 methods> ([[vshape_1]]) ; CHECK-NEXT: VShape: <vftable 1 methods> ([[vshape_1]])
; CHECK-NEXT: SizeOf: 48 ; CHECK-NEXT: SizeOf: 48
; CHECK-NEXT: Name: D ; CHECK-NEXT: Name: D
▲ Show 20 Lines • Show All 370 Lines • Show Last 20 Lines