[PATCH] D43589: [DEBUGINFO] Do not output labels for empty macinfo sections.

[Alexey Bataev via Phabricator via llvm-commits]

ABataev updated this revision to Diff 135414.
ABataev added a comment.

Updated patch


Repository:
  rL LLVM

https://reviews.llvm.org/D43589

Files:
  lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  test/DebugInfo/X86/empty_macinfo.ll


Index: test/DebugInfo/X86/empty_macinfo.ll
===================================================================
--- /dev/null
+++ test/DebugInfo/X86/empty_macinfo.ll
@@ -0,0 +1,24 @@
+; RUN: llc -mtriple x86_64-pc-linux < %s -dwarf-version 4 | FileCheck %s
+
+; Test that we don't pollute the start of the file with debug sections
+
+; CHECK:      .section .debug_macinfo,"", at progbits
+; CHECK-NEXT: .byte 0 # End Of Macro List Mark
+; CHECK-NEXT: .section
+; CHECK-NOT:  .debug_macinfo
+
+define void @f() !dbg !4 {
+  ret void, !dbg !9
+}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "foo", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
+!1 = !DIFile(filename: "/foo/test.c", directory: "/foo")
+!2 = !{}
+!4 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, variables: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{null}
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !DILocation(line: 1, column: 15, scope: !4)
Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2020,8 +2020,11 @@
     auto *SkCU = TheCU.getSkeleton();
     DwarfCompileUnit &U = SkCU ? *SkCU : TheCU;
     auto *CUNode = cast<DICompileUnit>(P.first);
-    Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
-    handleMacroNodes(CUNode->getMacros(), U);
+    DIMacroNodeArray Macros = CUNode->getMacros();
+    if (!Macros.empty()) {
+      Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
+      handleMacroNodes(Macros, U);
+    }
   }
   Asm->OutStreamer->AddComment("End Of Macro List Mark");
   Asm->EmitInt8(0);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43589.135414.patch
Type: text/x-patch
Size: 1977 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180222/875b450c/attachment.bin>