<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Mar 17, 2016 at 4:58 PM, Peter Collingbourne via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: pcc<br>
Date: Thu Mar 17 18:58:03 2016<br>
New Revision: 263765<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263765&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263765&view=rev</a><br>
Log:<br>
DebugInfo: Add ability to not emit DW_AT_vtable_elem_location for virtual functions.<br>
<br>
A virtual index of -1u indicates that the subprogram's virtual index is<br>
unrepresentable (for example, when using the relative vtable ABI), so do<br>
not emit a DW_AT_vtable_elem_location attribute for it.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D18236" rel="noreferrer" target="_blank">http://reviews.llvm.org/D18236</a><br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/Generic/virtual-index.ll<br>
Modified:<br>
llvm/trunk/include/llvm/IR/DIBuilder.h<br>
llvm/trunk/lib/AsmParser/LLParser.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
llvm/trunk/lib/IR/AsmWriter.cpp<br>
llvm/trunk/test/Assembler/disubprogram.ll<br>
<br>
Modified: llvm/trunk/include/llvm/IR/DIBuilder.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DIBuilder.h?rev=263765&r1=263764&r2=263765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DIBuilder.h?rev=263765&r1=263764&r2=263765&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/DIBuilder.h (original)<br>
+++ llvm/trunk/include/llvm/IR/DIBuilder.h Thu Mar 17 18:58:03 2016<br>
@@ -558,7 +558,8 @@ namespace llvm {<br>
/// \param isDefinition True if this is a function definition.<br>
/// \param Virtuality Attributes describing virtualness. e.g. pure<br>
/// virtual function.<br>
- /// \param VTableIndex Index no of this method in virtual table.<br>
+ /// \param VTableIndex Index no of this method in virtual table, or -1u if<br>
+ /// unrepresentable.<br>
/// \param VTableHolder Type that holds vtable.<br>
/// \param Flags e.g. is this function prototyped or not.<br>
/// This flags are used to emit dwarf attributes.<br>
<br>
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=263765&r1=263764&r2=263765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=263765&r1=263764&r2=263765&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)<br>
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Thu Mar 17 18:58:03 2016<br>
@@ -3353,7 +3353,7 @@ bool LLParser::ParseMDField(LocTy Loc, S<br>
return TokError("expected DWARF virtuality code");<br>
<br>
unsigned Virtuality = dwarf::getVirtuality(Lex.getStrVal());<br>
- if (!Virtuality)<br>
+ if (Virtuality == dwarf::DW_VIRTUALITY_invalid)<br>
return TokError("invalid DWARF virtuality code" + Twine(" '") +<br>
Lex.getStrVal() + "'");<br>
assert(Virtuality <= Result.Max && "Expected valid DWARF virtuality code");<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=263765&r1=263764&r2=263765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=263765&r1=263764&r2=263765&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Thu Mar 17 18:58:03 2016<br>
@@ -1218,10 +1218,12 @@ void DwarfUnit::applySubprogramAttribute<br>
unsigned VK = SP->getVirtuality();<br>
if (VK) {<br>
addUInt(SPDie, dwarf::DW_AT_virtuality, dwarf::DW_FORM_data1, VK);<br>
- DIELoc *Block = getDIELoc();<br>
- addUInt(*Block, dwarf::DW_FORM_data1, dwarf::DW_OP_constu);<br>
- addUInt(*Block, dwarf::DW_FORM_udata, SP->getVirtualIndex());<br>
- addBlock(SPDie, dwarf::DW_AT_vtable_elem_location, Block);<br>
+ if (SP->getVirtualIndex() != -1u) {<br>
+ DIELoc *Block = getDIELoc();<br>
+ addUInt(*Block, dwarf::DW_FORM_data1, dwarf::DW_OP_constu);<br>
+ addUInt(*Block, dwarf::DW_FORM_udata, SP->getVirtualIndex());<br>
+ addBlock(SPDie, dwarf::DW_AT_vtable_elem_location, Block);<br>
+ }<br>
ContainingTypeMap.insert(<br>
std::make_pair(&SPDie, resolve(SP->getContainingType())));<br>
}<br>
<br>
Modified: llvm/trunk/lib/IR/AsmWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=263765&r1=263764&r2=263765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=263765&r1=263764&r2=263765&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/AsmWriter.cpp (original)<br>
+++ llvm/trunk/lib/IR/AsmWriter.cpp Thu Mar 17 18:58:03 2016<br>
@@ -1669,7 +1669,9 @@ static void writeDISubprogram(raw_ostrea<br>
Printer.printMetadata("containingType", N->getRawContainingType());<br>
Printer.printDwarfEnum("virtuality", N->getVirtuality(),<br>
dwarf::VirtualityString);<br>
- Printer.printInt("virtualIndex", N->getVirtualIndex());<br>
+ if (N->getVirtuality() != dwarf::DW_VIRTUALITY_none ||<br>
+ N->getVirtualIndex() != 0)<br></blockquote><div><br></div><div>That condition seems a bit wrong - 0 is a valid value for the field & will be emitted into the result. So we shouldn't suppress printing it when it's 0, should we? I think this should be the same test as in DwarfUnit.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ Printer.printInt("virtualIndex", N->getVirtualIndex(), false);<br>
Printer.printDIFlags("flags", N->getFlags());<br>
Printer.printBool("isOptimized", N->isOptimized());<br>
Printer.printMetadata("templateParams", N->getRawTemplateParams());<br>
<br>
Modified: llvm/trunk/test/Assembler/disubprogram.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/disubprogram.ll?rev=263765&r1=263764&r2=263765&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/disubprogram.ll?rev=263765&r1=263764&r2=263765&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Assembler/disubprogram.ll (original)<br>
+++ llvm/trunk/test/Assembler/disubprogram.ll Thu Mar 17 18:58:03 2016<br>
@@ -6,8 +6,8 @@ define void @_Z3foov() !dbg !9 {<br>
ret void<br>
}<br>
<br>
-; CHECK: !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9}<br>
-!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9}<br>
+; CHECK: !named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10, !11}<br>
+!named = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10, !11}<br>
<br>
!0 = !{null}<br>
!1 = distinct !DICompositeType(tag: DW_TAG_structure_type)<br>
@@ -31,5 +31,23 @@ define void @_Z3foov() !dbg !9 {<br>
flags: DIFlagPrototyped, isOptimized: true,<br>
templateParams: !5, declaration: !8, variables: !6)<br>
<br>
-!10 = !{i32 1, !"Debug Info Version", i32 3}<br>
-!llvm.module.flags = !{!10}<br>
+; CHECK: !10 = distinct !DISubprogram<br>
+; CHECK-SAME: virtualIndex: 0,<br>
+!10 = distinct !DISubprogram(name: "foo", linkageName: "_Zfoov", scope: !1,<br>
+ file: !2, line: 7, type: !3, isLocal: true,<br>
+ isDefinition: true, scopeLine: 8, containingType: !4,<br>
+ virtuality: DW_VIRTUALITY_pure_virtual, virtualIndex: 0,<br>
+ flags: DIFlagPrototyped, isOptimized: true,<br>
+ templateParams: !5, declaration: !8, variables: !6)<br>
+<br>
+; CHECK: !11 = distinct !DISubprogram<br>
+; CHECK-NOT: virtualIndex<br>
+!11 = distinct !DISubprogram(name: "foo", linkageName: "_Zfoov", scope: !1,<br>
+ file: !2, line: 7, type: !3, isLocal: true,<br>
+ isDefinition: true, scopeLine: 8, containingType: !4,<br>
+ virtuality: DW_VIRTUALITY_none,<br>
+ flags: DIFlagPrototyped, isOptimized: true,<br>
+ templateParams: !5, declaration: !8, variables: !6)<br>
+<br>
+!12 = !{i32 1, !"Debug Info Version", i32 3}<br>
+!llvm.module.flags = !{!12}<br>
<br>
Added: llvm/trunk/test/DebugInfo/Generic/virtual-index.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/virtual-index.ll?rev=263765&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/virtual-index.ll?rev=263765&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/Generic/virtual-index.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/Generic/virtual-index.ll Thu Mar 17 18:58:03 2016<br>
@@ -0,0 +1,71 @@<br>
+; REQUIRES: object-emission<br>
+<br>
+; RUN: %llc_dwarf -O0 -filetype=obj < %s > %t<br>
+; RUN: llvm-dwarfdump %t | FileCheck %s<br>
+<br>
+; Generated from the following C++ source code:<br>
+;<br>
+; struct A {<br>
+; virtual void f();<br>
+; virtual void g();<br>
+; };<br>
+;<br>
+; void A::f() {}<br>
+; void A::g() {}<br>
+;<br>
+; and manually edited to set virtualIndex attribute on the A::g subprogram to<br>
+; 4294967295.<br>
+<br>
+; CHECK: DW_TAG_subprogram [<br>
+; CHECK: DW_AT_vtable_elem_location [DW_FORM_exprloc] (<0x2> 10 00 )<br>
+<br>
+; CHECK: DW_TAG_subprogram [<br>
+; CHECK-NOT: DW_AT_vtable_elem_location<br>
+<br>
+%struct.A = type { i32 (...)** }<br>
+<br>
+@_ZTV1A = unnamed_addr constant [4 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.A*)* @_ZN1A1fEv to i8*), i8* bitcast (void (%struct.A*)* @_ZN1A1gEv to i8*)], align 8<br>
+<br>
+define void @_ZN1A1fEv(%struct.A* %this) unnamed_addr !dbg !18 {<br>
+ ret void<br>
+}<br>
+<br>
+define void @_ZN1A1gEv(%struct.A* %this) unnamed_addr !dbg !19 {<br>
+ ret void<br>
+}<br>
+<br>
+!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!20, !21}<br>
+!llvm.ident = !{!22}<br>
+<br>
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !2, retainedTypes: !3, subprograms: !17)<br>
+!1 = !DIFile(filename: "x", directory: "x")<br>
+!2 = !{}<br>
+!3 = !{!4}<br>
+!4 = !DICompositeType(tag: DW_TAG_structure_type, name: "A", file: !1, line: 1, size: 64, align: 64, elements: !5, vtableHolder: !"_ZTS1A", identifier: "_ZTS1A")<br>
+!5 = !{!6, !12, !16}<br>
+!6 = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$A", scope: !1, file: !1, baseType: !7, size: 64, flags: DIFlagArtificial)<br>
+!7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64)<br>
+!8 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__vtbl_ptr_type", baseType: !9, size: 64)<br>
+!9 = !DISubroutineType(types: !10)<br>
+!10 = !{!11}<br>
+!11 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)<br>
+!12 = !DISubprogram(name: "f", linkageName: "_ZN1A1fEv", scope: !"_ZTS1A", file: !1, line: 2, type: !13, isLocal: false, isDefinition: false, scopeLine: 2, containingType: !"_ZTS1A", virtuality: DW_VIRTUALITY_virtual, virtualIndex: 0, flags: DIFlagPrototyped, isOptimized: false)<br>
+!13 = !DISubroutineType(types: !14)<br>
+!14 = !{null, !15}<br>
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A", size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
+!16 = !DISubprogram(name: "g", linkageName: "_ZN1A1gEv", scope: !"_ZTS1A", file: !1, line: 3, type: !13, isLocal: false, isDefinition: false, scopeLine: 3, containingType: !"_ZTS1A", virtuality: DW_VIRTUALITY_virtual, virtualIndex: 4294967295, flags: DIFlagPrototyped, isOptimized: false)<br>
+!17 = !{!18, !19}<br>
+!18 = distinct !DISubprogram(name: "f", linkageName: "_ZN1A1fEv", scope: !"_ZTS1A", file: !1, line: 6, type: !13, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false, declaration: !12, variables: !2)<br>
+!19 = distinct !DISubprogram(name: "g", linkageName: "_ZN1A1gEv", scope: !"_ZTS1A", file: !1, line: 7, type: !13, isLocal: false, isDefinition: true, scopeLine: 7, flags: DIFlagPrototyped, isOptimized: false, declaration: !16, variables: !2)<br>
+!20 = !{i32 2, !"Dwarf Version", i32 4}<br>
+!21 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!22 = !{!"clang version 3.9.0 (trunk 263469) (llvm/trunk 263156)"}<br>
+!23 = !DILocalVariable(name: "this", arg: 1, scope: !18, type: !24, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
+!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1A", size: 64, align: 64)<br>
+!25 = !DIExpression()<br>
+!26 = !DILocation(line: 0, scope: !18)<br>
+!27 = !DILocation(line: 6, column: 14, scope: !18)<br>
+!28 = !DILocalVariable(name: "this", arg: 1, scope: !19, type: !24, flags: DIFlagArtificial | DIFlagObjectPointer)<br>
+!29 = !DILocation(line: 0, scope: !19)<br>
+!30 = !DILocation(line: 7, column: 14, scope: !19)<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>