llvm-dwarfdump: automatically dump both regular and .dwo variant of sections

Since users typically don't really care about the .dwo / non.dwo
distinction, this patch makes it so dwarfdump --debug-<info,...> dumps
.debug_info and (if available) also .debug_info.dwo. This simplifies
the command line interface (I've removed all dwo-specific dump
options) and makes the tool friendlier to use.

Differential Revision: https://reviews.llvm.org/D37771

llvm-svn: 313207

11 files changed, 23 insertions, 21 deletions

diff --git a/llvm/test/DebugInfo/Inputs/gmlt.ll b/llvm/test/DebugInfo/Inputs/gmlt.ll
index 116cd75b811..da2a8b80321 100644
--- a/llvm/test/DebugInfo/Inputs/gmlt.ll
+++ b/llvm/test/DebugInfo/Inputs/gmlt.ll
@@ -87,12 +87,8 @@
 
 
 ; Check that we don't emit any pubnames or pubtypes under -gmlt
-; CHECK: .debug_pubnames contents:
-; CHECK-NOT: Offset
-
-; CHECK: .debug_pubtypes contents:
-; CHECK-NOT: Offset
-
+; CHECK-NOT: .debug_pubnames contents:
+; CHECK-NOT: .debug_pubtypes contents:
 ; CHECK: .apple{{.*}} contents:
 
 ; Function Attrs: nounwind uwtable
diff --git a/llvm/test/DebugInfo/X86/fission-inline.ll b/llvm/test/DebugInfo/X86/fission-inline.ll
index 8bded7b53ce..614363a6517 100644
--- a/llvm/test/DebugInfo/X86/fission-inline.ll
+++ b/llvm/test/DebugInfo/X86/fission-inline.ll
@@ -71,6 +71,7 @@
 ; CHECK:     DW_AT_call_file
 ; CHECK-NEXT:     DW_AT_call_line {{.*}} (18)
 ; CHECK-NOT: DW_
+; CHECK: .debug_info.dwo contents:
 
 ; RELOCS-NOT: RELOCATION RECORDS FOR [.rela.debug_ranges]
 
diff --git a/llvm/test/DebugInfo/X86/fission-no-inlining.ll b/llvm/test/DebugInfo/X86/fission-no-inlining.ll
index a9ed56ac0f1..2faf94539e9 100644
--- a/llvm/test/DebugInfo/X86/fission-no-inlining.ll
+++ b/llvm/test/DebugInfo/X86/fission-no-inlining.ll
@@ -1,6 +1,8 @@
 ; RUN: llc -split-dwarf-file=foo.dwo -O0 < %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj | llvm-dwarfdump -debug-info - | FileCheck %s
 
+; CHECK: .debug_info contents:
 ; CHECK-NOT: DW_TAG_subprogram
+; CHECK: contents:
 
 ; IR generated from the following source:
 ; void f1();
diff --git a/llvm/test/DebugInfo/X86/fission-ranges.ll b/llvm/test/DebugInfo/X86/fission-ranges.ll
index 9bd834377b6..4bfe0ddffbf 100644
--- a/llvm/test/DebugInfo/X86/fission-ranges.ll
+++ b/llvm/test/DebugInfo/X86/fission-ranges.ll
@@ -17,7 +17,7 @@
 ; CHECK: DW_AT_location [DW_FORM_sec_offset]   ([[B:0x[0-9a-z]*]]
 ; CHECK: DW_AT_location [DW_FORM_sec_offset]   ([[D:0x[0-9a-z]*]]
 ; CHECK: DW_AT_ranges [DW_FORM_sec_offset]   (0x00000000
-; CHECK: .debug_loc contents:
+; CHECK-NOT: .debug_loc contents:
 ; CHECK-NOT: Beginning address offset
 ; CHECK: .debug_loc.dwo contents:
 
diff --git a/llvm/test/DebugInfo/X86/generate-odr-hash.ll b/llvm/test/DebugInfo/X86/generate-odr-hash.ll
index 144b5f65eea..c687c9e5afa 100644
--- a/llvm/test/DebugInfo/X86/generate-odr-hash.ll
+++ b/llvm/test/DebugInfo/X86/generate-odr-hash.ll
@@ -74,8 +74,7 @@
 ; CHECK-NEXT: DW_AT_signature {{.*}} (0xfd756cee88f8a118)
 
 ; SINGLE-LABEL: .debug_types contents:
-; FISSION-NOT: .debug_types contents:
-; FISSION-LABEL: .debug_types.dwo contents:
+; FISSION: .debug_types.dwo contents:
 
 ; Check that we generate a hash for bar and the value.
 ; CHECK-NOT: type_signature
@@ -127,7 +126,8 @@
 ; CHECK: file_names{{.*}} bar.cpp
 ; CHECK-NOT: file_names[
 
-; CHECK-LABEL: .debug_line.dwo contents:
+; FISSION: .debug_line.dwo contents:
+; CHECK-NOT: .debug_line.dwo contents:
 ; FISSION: Line table prologue
 ; FISSION: opcode_base: 1
 ; FISSION-NOT: standard_opcode_lengths
diff --git a/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll b/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll
index c4207afec81..a928a183984 100644
--- a/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll
+++ b/llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll
@@ -24,14 +24,10 @@
 ; GPUB-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000
 ; GPUB-NEXT: Name
 
-; NONE: .debug_pubnames contents:
-; NONE: {{^$}}
-; NONE: .debug_pubtypes contents:
-; NONE: {{^$}}
-; NONE: .debug_gnu_pubnames contents:
-; NONE: {{^$}}
-; NONE: .debug_gnu_pubtypes contents:
-; NONE: {{^$}}
+; NONE-NOT: .debug_pubnames contents:
+; NONE-NOT: .debug_pubtypes contents:
+; NONE-NOT: .debug_gnu_pubnames contents:
+; NONE-NOT: .debug_gnu_pubtypes contents:
 
 
 ; Function Attrs: noinline uwtable
diff --git a/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll b/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll
index 3bfbfc907ce..da7e08c4270 100644
--- a/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll
+++ b/llvm/test/DebugInfo/X86/split-dwarf-cross-unit-reference.ll
@@ -1,11 +1,11 @@
 ; RUN: llc -mtriple=x86_64-linux -split-dwarf-cross-cu-references -split-dwarf-file=foo.dwo -filetype=obj -o %t < %s
 ; RUN: llvm-objdump -r %t | FileCheck %s
-; RUN: llvm-dwarfdump -v -debug-info-dwo %t | FileCheck --check-prefix=ALL --check-prefix=INFO --check-prefix=DWO --check-prefix=CROSS %s
+; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=INFO --check-prefix=DWO --check-prefix=CROSS %s
 ; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s
 
 ; RUN: llc -mtriple=x86_64-linux -split-dwarf-file=foo.dwo -filetype=obj -o %t < %s
 ; RUN: llvm-objdump -r %t | FileCheck %s
-; RUN: llvm-dwarfdump -v -debug-info-dwo %t | FileCheck --check-prefix=ALL --check-prefix=DWO --check-prefix=NOCROSS %s
+; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=DWO --check-prefix=NOCROSS %s
 ; RUN: llvm-dwarfdump -v -debug-info %t | FileCheck --check-prefix=ALL --check-prefix=INFO %s
 
 ; Testing cross-CU references for types, subprograms, and variables
@@ -42,6 +42,7 @@
 ; * debug_info.dwo contains duplicate types, abstract subprograms and abstract
 ;   variables otherwise to avoid the need for cross-cu references
 
+; DWO: .debug_info.dwo contents:
 ; CHECK-NOT: .rel{{a?}}.debug_info.dwo
 ; CHECK: RELOCATION RECORDS FOR [.rel{{a?}}.debug_info]:
 ; CHECK-NOT: RELOCATION RECORDS
diff --git a/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll b/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll
index 688ef8376c8..e4d8a296315 100644
--- a/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll
+++ b/llvm/test/DebugInfo/X86/split-dwarf-multiple-cu-hash.ll
@@ -3,8 +3,10 @@
 ; RUN: %llc_dwarf -split-dwarf-file=bar.dwo  %s -filetype=obj -o %t/b.o
 ; RUN: llvm-dwarfdump -debug-info %t/a.o %t/b.o | FileCheck %s
 
+; CHECK: .debug_info contents:
 ; CHECK: dwo_id {{.*}}([[HASH:.*]])
 ; CHECK-NOT: dwo_id {{.*}}([[HASH]])
+; CHECK: .debug_info.dwo contents:
 
 target triple = "x86_64-pc-linux"
 
diff --git a/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll b/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll
index 4e8debb20a8..1ce6d1c6ba3 100644
--- a/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll
+++ b/llvm/test/DebugInfo/X86/split-dwarf-omit-empty.ll
@@ -15,8 +15,10 @@
 ; will be emitted. This emulates something more like the available_externally
 ; import performed by ThinLTO.
 
+; CHECK: .debug_info contents:
 ; CHECK: Compile Unit
 ; CHECK-NOT: Compile Unit
+; CHECK: .debug_info.dwo contents:
 
 target triple = "x86_64-pc-linux"
 
diff --git a/llvm/test/DebugInfo/dwarfdump-dump-flags.test b/llvm/test/DebugInfo/dwarfdump-dump-flags.test
index 513650abe3b..f83ebd00bd3 100644
--- a/llvm/test/DebugInfo/dwarfdump-dump-flags.test
+++ b/llvm/test/DebugInfo/dwarfdump-dump-flags.test
@@ -6,10 +6,11 @@
 ; RUN: llvm-dwarfdump %p/Inputs/dwarfdump-test.macho-i386.o --debug-ranges | FileCheck %s -check-prefix DUMP_RANGES
 
 ; DUMP_ALL: .debug_info
-; DUMP_ALL: .debug_ranges
+; DUMP_ALL: .debug_str
 
 ; DUMP_INFO: .debug_info
 ; DUMP_INFO-NOT: .debug_ranges
+; DUMP_INFO-NOT: .debug_str
 
 ; DUMP_RANGES-NOT: .debug_info
 ; DUMP_RANGES: .debug_ranges
diff --git a/llvm/test/DebugInfo/dwarfdump-dwp.test b/llvm/test/DebugInfo/dwarfdump-dwp.test
index 2bdcdb9ea62..7d945eccf64 100644
--- a/llvm/test/DebugInfo/dwarfdump-dwp.test
+++ b/llvm/test/DebugInfo/dwarfdump-dwp.test
@@ -9,6 +9,7 @@ RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-dwp.x86_64.o | FileCheck %s
 ;   bar b() {
 ;   }
 
+; CHECK-NOT: .debug_info contents:
 ; CHECK-LABEL: .debug_info.dwo contents:
 ; CHECK: Compile Unit