maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[codeview] Set the new IntroducedVirtual debug info flag 

llvm-svn: 273454
This commit is contained in:
Reid Kleckner 2016-06-22 18:34:45 +00:00
parent 156a7239c1
commit c4871eddb7
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@ -1195,6 +1195,15 @@ llvm::DISubprogram *CGDebugInfo::CreateCXXMemberFunction(
MicrosoftVTableContext::MethodVFTableLocation ML = MicrosoftVTableContext::MethodVFTableLocation ML =
CGM.getMicrosoftVTableContext().getMethodVFTableLocation(GD); CGM.getMicrosoftVTableContext().getMethodVFTableLocation(GD);
VIndex = ML.Index; VIndex = ML.Index;
// CodeView only records the vftable offset in the class that introduces
// the virtual method. This is possible because, unlike Itanium, the MS
// C++ ABI does not include all virtual methods from non-primary bases in
// the vtable for the most derived class. For example, if C inherits from
// A and B, C's primary vftable will not include B's virtual methods.
if (Method->begin_overridden_methods() == Method->end_overridden_methods())
Flags |= llvm::DINode::FlagIntroducedVirtual;
// FIXME: Pass down ML.VFPtrOffset and ML.VBTableIndex. The debugger needs // FIXME: Pass down ML.VFPtrOffset and ML.VBTableIndex. The debugger needs
// these to synthesize a call to a virtual method in a complex inheritance // these to synthesize a call to a virtual method in a complex inheritance
// hierarchy. // hierarchy.

17
clang/test/CodeGenCXX/debug-info-ms-abi.cpp
View File

@ -10,10 +10,21 @@ struct Foo {
}; };
Foo f; Foo f;
Foo::Nested n; Foo::Nested n;
// CHECK: ![[Foo:[^ ]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo", // CHECK: ![[Foo:[^ ]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo",
// CHECK-SAME: identifier: ".?AUFoo@@" // CHECK-SAME: identifier: ".?AUFoo@@"
// CHECK: !DISubprogram(name: "f", {{.*}} containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 0, {{.*}})
// CHECK: !DISubprogram(name: "g", {{.*}} containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 1, {{.*}}) // CHECK: !DISubprogram(name: "f",
// CHECK: !DISubprogram(name: "h", {{.*}} containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 2, {{.*}}) // CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 0,
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
// CHECK: !DISubprogram(name: "g",
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 1,
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
// CHECK: !DISubprogram(name: "h",
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 2,
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
// CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Nested", // CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Nested",
// CHECK-SAME: identifier: ".?AUNested@Foo@@" // CHECK-SAME: identifier: ".?AUNested@Foo@@"