Index: llvm/trunk/include/llvm/IR/DIBuilder.h =================================================================== --- llvm/trunk/include/llvm/IR/DIBuilder.h +++ llvm/trunk/include/llvm/IR/DIBuilder.h @@ -147,7 +147,8 @@ /// \param Class Type for which this pointer points to members of. DIDerivedType *createMemberPointerType(DIType *PointeeTy, DIType *Class, uint64_t SizeInBits, - uint64_t AlignInBits = 0); + uint64_t AlignInBits = 0, + unsigned Flags = 0); /// Create debugging information entry for a c++ /// style reference or rvalue reference type. Index: llvm/trunk/include/llvm/IR/DebugInfoFlags.def =================================================================== --- llvm/trunk/include/llvm/IR/DebugInfoFlags.def +++ llvm/trunk/include/llvm/IR/DebugInfoFlags.def @@ -33,5 +33,9 @@ HANDLE_DI_FLAG((1 << 13), LValueReference) HANDLE_DI_FLAG((1 << 14), RValueReference) HANDLE_DI_FLAG((1 << 15), ExternalTypeRef) +HANDLE_DI_FLAG((1 << 16), SingleInheritance) +HANDLE_DI_FLAG((2 << 16), MultipleInheritance) +HANDLE_DI_FLAG((3 << 16), VirtualInheritance) +// Next flag is 1 << 18 #undef HANDLE_DI_FLAG Index: llvm/trunk/include/llvm/IR/DebugInfoMetadata.h =================================================================== --- llvm/trunk/include/llvm/IR/DebugInfoMetadata.h +++ llvm/trunk/include/llvm/IR/DebugInfoMetadata.h @@ -174,7 +174,9 @@ enum DIFlags { #define HANDLE_DI_FLAG(ID, NAME) Flag##NAME = ID, #include "llvm/IR/DebugInfoFlags.def" - FlagAccessibility = FlagPrivate | FlagProtected | FlagPublic + FlagAccessibility = FlagPrivate | FlagProtected | FlagPublic, + FlagPtrToMemberRep = FlagSingleInheritance | FlagMultipleInheritance | + FlagVirtualInheritance, }; static unsigned getFlag(StringRef Flag); Index: llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp =================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp +++ llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp @@ -979,20 +979,48 @@ return TypeTable.writePointer(PR); } +static PointerToMemberRepresentation translatePtrToMemberRep(bool IsPMF, + unsigned Flags) { + if (IsPMF) { + switch (Flags & DINode::FlagPtrToMemberRep) { + case 0: + return PointerToMemberRepresentation::GeneralFunction; + case DINode::FlagSingleInheritance: + return PointerToMemberRepresentation::SingleInheritanceFunction; + case DINode::FlagMultipleInheritance: + return PointerToMemberRepresentation::MultipleInheritanceFunction; + case DINode::FlagVirtualInheritance: + return PointerToMemberRepresentation::VirtualInheritanceFunction; + } + } else { + switch (Flags & DINode::FlagPtrToMemberRep) { + case 0: + return PointerToMemberRepresentation::GeneralData; + case DINode::FlagSingleInheritance: + return PointerToMemberRepresentation::SingleInheritanceData; + case DINode::FlagMultipleInheritance: + return PointerToMemberRepresentation::MultipleInheritanceData; + case DINode::FlagVirtualInheritance: + return PointerToMemberRepresentation::VirtualInheritanceData; + } + } + llvm_unreachable("invalid ptr to member representation"); +} + TypeIndex CodeViewDebug::lowerTypeMemberPointer(const DIDerivedType *Ty) { assert(Ty->getTag() == dwarf::DW_TAG_ptr_to_member_type); TypeIndex ClassTI = getTypeIndex(Ty->getClassType()); TypeIndex PointeeTI = getTypeIndex(Ty->getBaseType()); PointerKind PK = Asm->MAI->getPointerSize() == 8 ? PointerKind::Near64 : PointerKind::Near32; - PointerMode PM = isa(Ty->getBaseType()) - ? PointerMode::PointerToMemberFunction - : PointerMode::PointerToDataMember; + bool IsPMF = isa(Ty->getBaseType()); + PointerMode PM = IsPMF ? PointerMode::PointerToMemberFunction + : PointerMode::PointerToDataMember; PointerOptions PO = PointerOptions::None; // FIXME - // FIXME: Thread this ABI info through metadata. - PointerToMemberRepresentation PMR = PointerToMemberRepresentation::Unknown; - MemberPointerInfo MPI(ClassTI, PMR); - PointerRecord PR(PointeeTI, PK, PM, PO, Ty->getSizeInBits() / 8, MPI); + MemberPointerInfo MPI(ClassTI, + translatePtrToMemberRep(IsPMF, Ty->getFlags())); + uint64_t SizeInBytes = Ty->getSizeInBits() / 8; + PointerRecord PR(PointeeTI, PK, PM, PO, SizeInBytes, MPI); return TypeTable.writePointer(PR); } Index: llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp =================================================================== --- llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp +++ llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp @@ -400,6 +400,7 @@ W->printNumber("IsConst", Ptr.isConst()); W->printNumber("IsVolatile", Ptr.isVolatile()); W->printNumber("IsUnaligned", Ptr.isUnaligned()); + W->printNumber("SizeOf", Ptr.getSize()); if (Ptr.isPointerToMember()) { const MemberPointerInfo &MI = Ptr.getMemberInfo(); Index: llvm/trunk/lib/IR/DIBuilder.cpp =================================================================== --- llvm/trunk/lib/IR/DIBuilder.cpp +++ llvm/trunk/lib/IR/DIBuilder.cpp @@ -253,10 +253,11 @@ DIDerivedType *DIBuilder::createMemberPointerType(DIType *PointeeTy, DIType *Base, uint64_t SizeInBits, - uint64_t AlignInBits) { + uint64_t AlignInBits, + unsigned Flags) { return DIDerivedType::get(VMContext, dwarf::DW_TAG_ptr_to_member_type, "", nullptr, 0, nullptr, PointeeTy, SizeInBits, - AlignInBits, 0, 0, Base); + AlignInBits, 0, Flags, Base); } DIDerivedType *DIBuilder::createReferenceType(unsigned Tag, DIType *RTy, Index: llvm/trunk/lib/IR/DebugInfoMetadata.cpp =================================================================== --- llvm/trunk/lib/IR/DebugInfoMetadata.cpp +++ llvm/trunk/lib/IR/DebugInfoMetadata.cpp @@ -85,8 +85,8 @@ unsigned DINode::splitFlags(unsigned Flags, SmallVectorImpl &SplitFlags) { - // Accessibility flags need to be specially handled, since they're packed - // together. + // Accessibility and member pointer flags need to be specially handled, since + // they're packed together. if (unsigned A = Flags & FlagAccessibility) { if (A == FlagPrivate) SplitFlags.push_back(FlagPrivate); @@ -96,6 +96,15 @@ SplitFlags.push_back(FlagPublic); Flags &= ~A; } + if (unsigned R = Flags & FlagPtrToMemberRep) { + if (R == FlagSingleInheritance) + SplitFlags.push_back(FlagSingleInheritance); + else if (R == FlagMultipleInheritance) + SplitFlags.push_back(FlagMultipleInheritance); + else + SplitFlags.push_back(FlagVirtualInheritance); + Flags &= ~R; + } #define HANDLE_DI_FLAG(ID, NAME) \ if (unsigned Bit = Flags & ID) { \ Index: llvm/trunk/test/DebugInfo/COFF/types-basic.ll =================================================================== --- llvm/trunk/test/DebugInfo/COFF/types-basic.ll +++ llvm/trunk/test/DebugInfo/COFF/types-basic.ll @@ -100,7 +100,7 @@ ; CHECK: IsVolatile: 0 ; CHECK: IsUnaligned: 0 ; CHECK: ClassType: A (0x1005) -; CHECK: Representation: Unknown (0x0) +; CHECK: Representation: GeneralData (0x4) ; CHECK: } ; CHECK: Pointer (0x1007) { ; CHECK: TypeLeafKind: LF_POINTER (0x1002) @@ -140,7 +140,7 @@ ; CHECK: IsVolatile: 0 ; CHECK: IsUnaligned: 0 ; CHECK: ClassType: A (0x1005) -; CHECK: Representation: Unknown (0x0) +; CHECK: Representation: GeneralFunction (0x8) ; CHECK: } ; CHECK: Modifier (0x100B) { ; CHECK: TypeLeafKind: LF_MODIFIER (0x1001) Index: llvm/trunk/test/DebugInfo/COFF/types-ptr-to-member.ll =================================================================== --- llvm/trunk/test/DebugInfo/COFF/types-ptr-to-member.ll +++ llvm/trunk/test/DebugInfo/COFF/types-ptr-to-member.ll @@ -0,0 +1,209 @@ +; RUN: llc < %s -filetype=obj | llvm-readobj - -codeview | FileCheck %s + +; C++ source to regenerate: +; $ cat t.cpp +; struct A { int a; }; +; struct B { int b; }; +; struct C : A, B { int c; }; +; struct D : virtual C { int d; }; +; struct E; +; int A::*pmd_a; +; int C::*pmd_b; +; int D::*pmd_c; +; int E::*pmd_d; +; void (A::*pmf_a)(); +; void (C::*pmf_b)(); +; void (D::*pmf_c)(); +; void (E::*pmf_d)(); +; $ clang t.cpp -S -emit-llvm -g -gcodeview -o t.ll + +; CHECK: CodeViewTypes [ + +; Pointer to data member + +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: int (0x74) +; CHECK: PointerAttributes: 0x804C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToDataMember (0x2) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 4 +; CHECK: ClassType: A +; CHECK: Representation: SingleInheritanceData (0x1) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: int (0x74) +; CHECK: PointerAttributes: 0x804C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToDataMember (0x2) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 4 +; CHECK: ClassType: C +; CHECK: Representation: MultipleInheritanceData (0x2) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: int (0x74) +; CHECK: PointerAttributes: 0x1004C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToDataMember (0x2) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 8 +; CHECK: ClassType: D +; CHECK: Representation: VirtualInheritanceData (0x3) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: int (0x74) +; CHECK: PointerAttributes: 0x1804C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToDataMember (0x2) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 12 +; CHECK: ClassType: E +; CHECK: Representation: GeneralData (0x4) +; CHECK: } + +; Pointer to member function + +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: void (const A*) +; CHECK: PointerAttributes: 0x1006C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToMemberFunction (0x3) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 8 +; CHECK: ClassType: A +; CHECK: Representation: SingleInheritanceFunction (0x5) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: void (C*) +; CHECK: PointerAttributes: 0x2006C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToMemberFunction (0x3) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 16 +; CHECK: ClassType: C +; CHECK: Representation: MultipleInheritanceFunction (0x6) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: void (D*) +; CHECK: PointerAttributes: 0x2006C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToMemberFunction (0x3) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 16 +; CHECK: ClassType: D +; CHECK: Representation: VirtualInheritanceFunction (0x7) +; CHECK: } +; CHECK: Pointer ({{.*}}) { +; CHECK: TypeLeafKind: LF_POINTER (0x1002) +; CHECK: PointeeType: void (E*) +; CHECK: PointerAttributes: 0x3006C +; CHECK: PtrType: Near64 (0xC) +; CHECK: PtrMode: PointerToMemberFunction (0x3) +; CHECK: IsFlat: 0 +; CHECK: IsConst: 0 +; CHECK: IsVolatile: 0 +; CHECK: IsUnaligned: 0 +; CHECK: SizeOf: 24 +; CHECK: ClassType: E +; CHECK: Representation: GeneralFunction (0x8) +; CHECK: } +; CHECK: ] + +; ModuleID = 't.cpp' +source_filename = "t.cpp" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-windows-msvc19.0.23918" + +@"\01?pmd_a@@3PEQA@@HEQ1@" = global i32 -1, align 8 +@"\01?pmd_b@@3PEQC@@HEQ1@" = global i32 -1, align 8 +@"\01?pmd_c@@3PEQD@@HEQ1@" = global { i32, i32 } { i32 0, i32 -1 }, align 8 +@"\01?pmd_d@@3PEQE@@HEQ1@" = global { i32, i32, i32 } { i32 0, i32 0, i32 -1 }, align 8 +@"\01?pmf_a@@3P8A@@EBAXXZEQ1@" = global i8* null, align 8 +@"\01?pmf_b@@3P8C@@EAAXXZEQ1@" = global { i8*, i32 } zeroinitializer, align 8 +@"\01?pmf_c@@3P8D@@EAAXXZEQ1@" = global { i8*, i32, i32 } zeroinitializer, align 8 +@"\01?pmf_d@@3P8E@@EAAXXZEQ1@" = global { i8*, i32, i32, i32 } zeroinitializer, align 8 + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!47, !48, !49} +!llvm.ident = !{!50} + +!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.9.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3) +!1 = !DIFile(filename: "t.cpp", directory: "D:\5Csrc\5Cllvm\5Cbuild") +!2 = !{} +!3 = !{!4, !10, !20, !23, !26, !32, !37, !42} +!4 = distinct !DIGlobalVariable(name: "pmd_a", linkageName: "\01?pmd_a@@3PEQA@@HEQ1@", scope: !0, file: !1, line: 6, type: !5, isLocal: false, isDefinition: true, variable: i32* @"\01?pmd_a@@3PEQA@@HEQ1@") +!5 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 32, flags: DIFlagSingleInheritance, extraData: !7) +!6 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "A", file: !1, line: 1, size: 32, align: 32, elements: !8, identifier: ".?AUA@@") +!8 = !{!9} +!9 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !7, file: !1, line: 1, baseType: !6, size: 32, align: 32) +!10 = distinct !DIGlobalVariable(name: "pmd_b", linkageName: "\01?pmd_b@@3PEQC@@HEQ1@", scope: !0, file: !1, line: 7, type: !11, isLocal: false, isDefinition: true, variable: i32* @"\01?pmd_b@@3PEQC@@HEQ1@") +!11 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 32, flags: DIFlagMultipleInheritance, extraData: !12) +!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "C", file: !1, line: 3, size: 96, align: 32, elements: !13, identifier: ".?AUC@@") +!13 = !{!14, !15, !19} +!14 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !12, baseType: !7) +!15 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !12, baseType: !16, offset: 32) +!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "B", file: !1, line: 2, size: 32, align: 32, elements: !17, identifier: ".?AUB@@") +!17 = !{!18} +!18 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !16, file: !1, line: 2, baseType: !6, size: 32, align: 32) +!19 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !12, file: !1, line: 3, baseType: !6, size: 32, align: 32, offset: 64) +!20 = distinct !DIGlobalVariable(name: "pmd_c", linkageName: "\01?pmd_c@@3PEQD@@HEQ1@", scope: !0, file: !1, line: 8, type: !21, isLocal: false, isDefinition: true, variable: { i32, i32 }* @"\01?pmd_c@@3PEQD@@HEQ1@") +!21 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 64, flags: DIFlagVirtualInheritance, extraData: !22) +!22 = !DICompositeType(tag: DW_TAG_structure_type, name: "D", file: !1, line: 4, size: 256, align: 64, flags: DIFlagFwdDecl, identifier: ".?AUD@@") +!23 = distinct !DIGlobalVariable(name: "pmd_d", linkageName: "\01?pmd_d@@3PEQE@@HEQ1@", scope: !0, file: !1, line: 9, type: !24, isLocal: false, isDefinition: true, variable: { i32, i32, i32 }* @"\01?pmd_d@@3PEQE@@HEQ1@") +!24 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !6, size: 96, extraData: !25) +!25 = !DICompositeType(tag: DW_TAG_structure_type, name: "E", file: !1, line: 5, flags: DIFlagFwdDecl, identifier: ".?AUE@@") +!26 = distinct !DIGlobalVariable(name: "pmf_a", linkageName: "\01?pmf_a@@3P8A@@EBAXXZEQ1@", scope: !0, file: !1, line: 10, type: !27, isLocal: false, isDefinition: true, variable: i8** @"\01?pmf_a@@3P8A@@EBAXXZEQ1@") +!27 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !28, size: 64, flags: DIFlagSingleInheritance, extraData: !7) +!28 = !DISubroutineType(types: !29) +!29 = !{null, !30} +!30 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !31, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!31 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !7) +!32 = distinct !DIGlobalVariable(name: "pmf_b", linkageName: "\01?pmf_b@@3P8C@@EAAXXZEQ1@", scope: !0, file: !1, line: 11, type: !33, isLocal: false, isDefinition: true, variable: { i8*, i32 }* @"\01?pmf_b@@3P8C@@EAAXXZEQ1@") +!33 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !34, size: 128, flags: DIFlagMultipleInheritance, extraData: !12) +!34 = !DISubroutineType(types: !35) +!35 = !{null, !36} +!36 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!37 = distinct !DIGlobalVariable(name: "pmf_c", linkageName: "\01?pmf_c@@3P8D@@EAAXXZEQ1@", scope: !0, file: !1, line: 12, type: !38, isLocal: false, isDefinition: true, variable: { i8*, i32, i32 }* @"\01?pmf_c@@3P8D@@EAAXXZEQ1@") +!38 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !39, size: 128, flags: DIFlagVirtualInheritance, extraData: !22) +!39 = !DISubroutineType(types: !40) +!40 = !{null, !41} +!41 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !22, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!42 = distinct !DIGlobalVariable(name: "pmf_d", linkageName: "\01?pmf_d@@3P8E@@EAAXXZEQ1@", scope: !0, file: !1, line: 13, type: !43, isLocal: false, isDefinition: true, variable: { i8*, i32, i32, i32 }* @"\01?pmf_d@@3P8E@@EAAXXZEQ1@") +!43 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !44, size: 192, extraData: !25) +!44 = !DISubroutineType(types: !45) +!45 = !{null, !46} +!46 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !25, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!47 = !{i32 2, !"CodeView", i32 1} +!48 = !{i32 2, !"Debug Info Version", i32 3} +!49 = !{i32 1, !"PIC Level", i32 2} +!50 = !{!"clang version 3.9.0 "}