[PATCH] D64784: Skip zero column for inline sites

[David Blaikie via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL366264: DWARF: Skip zero column for inline call sites (authored by dblaikie, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D64784?vs=210020&id=210175#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D64784/new/

https://reviews.llvm.org/D64784

Files:
  llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  llvm/trunk/test/DebugInfo/X86/fission-inline.ll


Index: llvm/trunk/test/DebugInfo/X86/fission-inline.ll
===================================================================
--- llvm/trunk/test/DebugInfo/X86/fission-inline.ll
+++ llvm/trunk/test/DebugInfo/X86/fission-inline.ll
@@ -71,6 +71,8 @@
 ; CHECK:     DW_AT_call_file
 ; CHECK-NEXT:     DW_AT_call_line {{.*}} (18)
 ; CHECK-NEXT:     DW_AT_call_column {{.*}} (0x05)
+; CHECK:     DW_AT_call_file
+; CHECK-NEXT:     DW_AT_call_line {{.*}} (21)
 ; CHECK-NOT: DW_
 ; CHECK: .debug_info.dwo contents:
 
@@ -82,6 +84,7 @@
   call void @_Z2f1v(), !dbg !26
   call void @_Z2f1v(), !dbg !25
   call void @_Z2f1v(), !dbg !28
+  call void @_Z2f1v(), !dbg !29
   ret void, !dbg !29
 }
 
@@ -122,4 +125,5 @@
 !26 = !DILocation(line: 11, column: 3, scope: !11, inlinedAt: !27)
 !27 = !DILocation(line: 18, column: 5, scope: !20)
 !28 = !DILocation(line: 12, column: 3, scope: !11, inlinedAt: !27)
-!29 = !DILocation(line: 21, column: 1, scope: !10)
+!29 = !DILocation(line: 12, column: 3, scope: !11, inlinedAt: !30)
+!30 = !DILocation(line: 21, column: 0, scope: !10)
Index: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -543,7 +543,8 @@
   addUInt(*ScopeDIE, dwarf::DW_AT_call_file, None,
           getOrCreateSourceID(IA->getFile()));
   addUInt(*ScopeDIE, dwarf::DW_AT_call_line, None, IA->getLine());
-  addUInt(*ScopeDIE, dwarf::DW_AT_call_column, None, IA->getColumn());
+  if (IA->getColumn())
+    addUInt(*ScopeDIE, dwarf::DW_AT_call_column, None, IA->getColumn());
   if (IA->getDiscriminator() && DD->getDwarfVersion() >= 4)
     addUInt(*ScopeDIE, dwarf::DW_AT_GNU_discriminator, None,
             IA->getDiscriminator());


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64784.210175.patch
Type: text/x-patch
Size: 1830 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190716/773a1100/attachment.bin>