[llvm] r248340 - Debug Info: Emit the dwo_name only in skeleton CUs, not in DWOs.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Tue Sep 22 18:21:00 2015
New Revision: 248340

URL: http://llvm.org/viewvc/llvm-project?rev=248340&view=rev
Log:
Debug Info: Emit the dwo_name only in skeleton CUs, not in DWOs.

Added:
    llvm/trunk/test/DebugInfo/dwo.ll
    llvm/trunk/test/DebugInfo/skeletoncu.ll
Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=248340&r1=248339&r2=248340&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Sep 22 18:21:00 2015
@@ -459,12 +459,14 @@ DwarfDebug::constructDwarfCompileUnit(co
   else
     NewCU.initSection(Asm->getObjFileLowering().getDwarfInfoSection());
 
-  // Module debugging: This is a prefabricated skeleton CU.
   if (DIUnit->getDWOId()) {
+    // This CU is either a clang module DWO or a skeleton CU.
     NewCU.addUInt(Die, dwarf::DW_AT_GNU_dwo_id, dwarf::DW_FORM_data8,
                   DIUnit->getDWOId());
-    NewCU.addString(Die, dwarf::DW_AT_GNU_dwo_name,
-                    DIUnit->getSplitDebugFilename());
+    if (!DIUnit->getSplitDebugFilename().empty())
+      // This is a prefabricated skeleton CU.
+      NewCU.addString(Die, dwarf::DW_AT_GNU_dwo_name,
+                      DIUnit->getSplitDebugFilename());
   }
 
   CUMap.insert(std::make_pair(DIUnit, &NewCU));

Added: llvm/trunk/test/DebugInfo/dwo.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwo.ll?rev=248340&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/dwo.ll (added)
+++ llvm/trunk/test/DebugInfo/dwo.ll Tue Sep 22 18:21:00 2015
@@ -0,0 +1,14 @@
+; RUN: %llc_dwarf %s -filetype=obj -o %t
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
+; CHECK: DW_TAG_compile_unit
+; CHECK: DW_AT_GNU_dwo_id {{.*}}abcd
+; CHECK-NOT: DW_AT_GNU_dwo_name
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "LLVM", isOptimized: false, runtimeVersion: 2, emissionKind: 1, enums: !2, retainedTypes: !2, subprograms: !2, globals: !2, imports: !2, dwoId: 43981)
+!1 = !DIFile(filename: "<stdin>", directory: "/")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}

Added: llvm/trunk/test/DebugInfo/skeletoncu.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/skeletoncu.ll?rev=248340&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/skeletoncu.ll (added)
+++ llvm/trunk/test/DebugInfo/skeletoncu.ll Tue Sep 22 18:21:00 2015
@@ -0,0 +1,15 @@
+; RUN: %llc_dwarf %s -filetype=obj -o %t
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
+; CHECK: DW_TAG_compile_unit
+; CHECK: DW_AT_GNU_dwo_id {{.*}}abcd
+; CHECK: DW_AT_GNU_dwo_name {{.*}}"my.dwo"
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "LLVM", isOptimized: false, runtimeVersion: 2, splitDebugFilename: "my.dwo", emissionKind: 1, enums: !2, retainedTypes: !2, subprograms: !2, globals: !2, imports: !2, dwoId: 43981)
+!1 = !DIFile(filename: "<stdin>", directory: "/")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+