Revert "[DebugInfo] Refactored macro related generation, added a test case for macinf...

This reverts commit 307f60a1a3ff04313a75e2fc11bc14df4fc2ffb8.

DebugInfo/X86/debug-macinfo-split-dwarf.ll fails on Windows:

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "c:\src\llvm-project\out\gn\bin\llc.exe" "-mtriple=x86_64-pc-windows-gnu" "-O0" "-split-dwarf-file=foo.dwo" "-filetype=obj"
Assertion failed: Section && "Cannot switch to a null section!", file ../../llvm/lib/MC/MCStreamer.cpp, line 1103
Stack dump:
0.	Program arguments: c:\src\llvm-project\out\gn\bin\llc.exe -mtriple=x86_64-pc-windows-gnu -O0 -split-dwarf-file=foo.dwo -filetype=obj

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 1e12b39..7413328 100644 (file)
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2792,7 +2792,8 @@ void DwarfDebug::emitMacroFile(DIMacroFile &F, DwarfCompileUnit &U) {
   Asm->EmitULEB128(dwarf::DW_MACINFO_end_file);
 }
 
-void DwarfDebug::emitDebugMacinfoImpl(MCSection *Section) {
+/// Emit macros into a debug macinfo section.
+void DwarfDebug::emitDebugMacinfo() {
   for (const auto &P : CUMap) {
     auto &TheCU = *P.second;
     auto *SkCU = TheCU.getSkeleton();
@@ -2801,7 +2802,8 @@ void DwarfDebug::emitDebugMacinfoImpl(MCSection *Section) {
     DIMacroNodeArray Macros = CUNode->getMacros();
     if (Macros.empty())
       continue;
-    Asm->OutStreamer->SwitchSection(Section);
+    Asm->OutStreamer->SwitchSection(
+        Asm->getObjFileLowering().getDwarfMacinfoSection());
     Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
     handleMacroNodes(Macros, U);
     Asm->OutStreamer->AddComment("End Of Macro List Mark");
@@ -2809,13 +2811,22 @@ void DwarfDebug::emitDebugMacinfoImpl(MCSection *Section) {
   }
 }
 
-/// Emit macros into a debug macinfo section.
-void DwarfDebug::emitDebugMacinfo() {
-  emitDebugMacinfoImpl(Asm->getObjFileLowering().getDwarfMacinfoSection());
-}
-
 void DwarfDebug::emitDebugMacinfoDWO() {
-  emitDebugMacinfoImpl(Asm->getObjFileLowering().getDwarfMacinfoDWOSection());
+  for (const auto &P : CUMap) {
+    auto &TheCU = *P.second;
+    auto *SkCU = TheCU.getSkeleton();
+    DwarfCompileUnit &U = SkCU ? *SkCU : TheCU;
+    auto *CUNode = cast<DICompileUnit>(P.first);
+    DIMacroNodeArray Macros = CUNode->getMacros();
+    if (Macros.empty())
+      continue;
+    Asm->OutStreamer->SwitchSection(
+        Asm->getObjFileLowering().getDwarfMacinfoDWOSection());
+    Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
+    handleMacroNodes(Macros, U);
+    Asm->OutStreamer->AddComment("End Of Macro List Mark");
+    Asm->emitInt8(0);
+  }
 }
 
 // DWARF5 Experimental Separate Dwarf emitters.

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 2e547f1..4d7bf0c 100644 (file)
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -513,7 +513,6 @@ class DwarfDebug : public DebugHandlerBase {
   void emitDebugMacinfo();
   /// Emit macros into a debug macinfo.dwo section.
   void emitDebugMacinfoDWO();
-  void emitDebugMacinfoImpl(MCSection *Section);
   void emitMacro(DIMacro &M);
   void emitMacroFile(DIMacroFile &F, DwarfCompileUnit &U);
   void handleMacroNodes(DIMacroNodeArray Nodes, DwarfCompileUnit &U);

diff --git a/llvm/test/DebugInfo/X86/debug-macinfo-split-dwarf.ll b/llvm/test/DebugInfo/X86/debug-macinfo-split-dwarf.ll
deleted file mode 100644 (file)
index 07a5322..0000000
--- a/llvm/test/DebugInfo/X86/debug-macinfo-split-dwarf.ll
+++ /dev/null
@@ -1,80 +0,0 @@
-; RUN: %llc_dwarf -O0 -split-dwarf-file=foo.dwo -filetype=obj < %s | llvm-dwarfdump -v - | FileCheck %s
-
-;CHECK-LABEL:.debug_macinfo.dwo contents:
-;CHECK-NEXT:  DW_MACINFO_start_file - lineno: 0 filenum: 1
-;CHECK-NEXT:    DW_MACINFO_start_file - lineno: 1 filenum: 2
-;CHECK-NEXT:      DW_MACINFO_define - lineno: 1 macro: define_1 12
-;CHECK-NEXT:    DW_MACINFO_end_file
-;CHECK-NEXT:    DW_MACINFO_start_file - lineno: 2 filenum: 3
-;CHECK-NEXT:      DW_MACINFO_define - lineno: 1 macro: define_2 14
-;CHECK-NEXT:    DW_MACINFO_end_file
-;CHECK-NEXT:  DW_MACINFO_end_file
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __llvm__ 1
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __clang__ 1
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __clang_major__ 10
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __clang_minor__ 0
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __clang_patchlevel__ 0
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __clang_version__ 10.0.0
-;CHECK-NEXT:  DW_MACINFO_define - lineno: 0 macro: __GNUC__ 4
-
-; ModuleID = 'debug-macro-split-dwarf.c'
-source_filename = "debug-macro-split-dwarf.c"
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @foo(i32 %a, i32 %b) #0 !dbg !25 {
-entry:
-  %a.addr = alloca i32, align 4
-  %b.addr = alloca i32, align 4
-  store i32 %a, i32* %a.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %a.addr, metadata !29, metadata !DIExpression()), !dbg !30
-  store i32 %b, i32* %b.addr, align 4
-  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !31, metadata !DIExpression()), !dbg !32
-  store i32 26, i32* %a.addr, align 4, !dbg !33
-  ret void, !dbg !34
-}
-; Function Attrs: nounwind readnone speculatable willreturn
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
-
-attributes #0 = { noinline nounwind optnone uwtable }
-attributes #1 = { nounwind readnone speculatable willreturn }
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!21, !22, !23}
-!llvm.ident = !{!24}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0", isOptimized: false, runtimeVersion: 0, splitDebugFilename: "debug-macro-split-dwarf.dwo", emissionKind: FullDebug, enums: !2, macros: !3, nameTableKind: GNU)
-!1 = !DIFile(filename: "debug-macro-split-dwarf.c", directory: "/", checksumkind: CSK_MD5, checksum: "e74d0fa8f714535c1bac6da2ffbbd898")
-!2 = !{}
-!3 = !{!4, !14, !15, !16, !17, !18, !19, !20}
-!4 = !DIMacroFile(file: !1, nodes: !5)
-!5 = !{!6, !10}
-!6 = !DIMacroFile(line: 1, file: !7, nodes: !8)
-!7 = !DIFile(filename: "./1.h", directory: "/", checksumkind: CSK_MD5, checksum: "6185a3a5ae6eb7d1fd2692718f9d95e5")
-!8 = !{!9}
-!9 = !DIMacro(type: DW_MACINFO_define, line: 1, name: "define_1", value: "12")
-!10 = !DIMacroFile(line: 2, file: !11, nodes: !12)
-!11 = !DIFile(filename: "./2.h", directory: "/", checksumkind: CSK_MD5, checksum: "d48d124c86c1b50a32517884ff962f83")
-!12 = !{!13}
-!13 = !DIMacro(type: DW_MACINFO_define, line: 1, name: "define_2", value: "14")
-!14 = !DIMacro(type: DW_MACINFO_define, name: "__llvm__", value: "1")
-!15 = !DIMacro(type: DW_MACINFO_define, name: "__clang__", value: "1")
-!16 = !DIMacro(type: DW_MACINFO_define, name: "__clang_major__", value: "10")
-!17 = !DIMacro(type: DW_MACINFO_define, name: "__clang_minor__", value: "0")
-!18 = !DIMacro(type: DW_MACINFO_define, name: "__clang_patchlevel__", value: "0")
-!19 = !DIMacro(type: DW_MACINFO_define, name: "__clang_version__", value: "10.0.0")
-!20 = !DIMacro(type: DW_MACINFO_define, name: "__GNUC__", value: "4")
-!21 = !{i32 7, !"Dwarf Version", i32 4}
-!22 = !{i32 2, !"Debug Info Version", i32 3}
-!23 = !{i32 1, !"wchar_size", i32 4}
-!24 = !{!"clang version 10.0.0 "}
-!25 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 4, type: !26, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
-!26 = !DISubroutineType(types: !27)
-!27 = !{null, !28, !28}
-!28 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!29 = !DILocalVariable(name: "a", arg: 1, scope: !25, file: !1, line: 4, type: !28)
-!30 = !DILocation(line: 4, column: 14, scope: !25)
-!31 = !DILocalVariable(name: "b", arg: 2, scope: !25, file: !1, line: 4, type: !28)
-!32 = !DILocation(line: 4, column: 21, scope: !25)
-!33 = !DILocation(line: 5, column: 4, scope: !25)
-!34 = !DILocation(line: 6, column: 1, scope: !25)