llvm-dwarfdump: support a --show-children option
This will print all children of a DIE when selectively printing only
one DIE at a given offset.
llvm-svn: 313464
diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h
index 59f8e29..9da31e6 100644
--- a/llvm/include/llvm/DebugInfo/DIContext.h
+++ b/llvm/include/llvm/DebugInfo/DIContext.h
@@ -139,6 +139,7 @@
struct DIDumpOptions {
unsigned DumpType = DIDT_All;
bool DumpEH = false;
+ bool ShowChildren = false;
bool SummarizeTypes = false;
bool Verbose = false;
};
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index 02d37f2..373452a 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -223,6 +223,8 @@
Optional<uint64_t> DumpOffset;
uint64_t DumpType = DumpOpts.DumpType;
bool DumpEH = DumpOpts.DumpEH;
+ unsigned RecDepth =
+ DumpOpts.ShowChildren ? std::numeric_limits<unsigned>::max() : 0;
StringRef Extension = sys::path::extension(DObj->getFileName());
bool IsDWO = (Extension == ".dwo") || (Extension == ".dwp");
@@ -260,7 +262,7 @@
if (shouldDump(IsExplicit, Name, DIDT_ID_DebugInfo, Section.Data)) {
for (const auto &CU : CUs)
if (DumpOffset)
- CU->getDIEForOffset(DumpOffset.getValue()).dump(OS, 0);
+ CU->getDIEForOffset(DumpOffset.getValue()).dump(OS, RecDepth);
else
CU->dump(OS, DumpOpts);
}
@@ -277,7 +279,7 @@
for (const auto &TUS : TUSections)
for (const auto &TU : TUS)
if (DumpOffset)
- TU->getDIEForOffset(*DumpOffset).dump(OS, 0);
+ TU->getDIEForOffset(*DumpOffset).dump(OS, RecDepth);
else
TU->dump(OS, DumpOpts);
};
diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_info_offset.test b/llvm/test/tools/llvm-dwarfdump/X86/debug_info_offset.test
index d3d1b6a..0c95eab 100644
--- a/llvm/test/tools/llvm-dwarfdump/X86/debug_info_offset.test
+++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_info_offset.test
@@ -6,5 +6,17 @@
CHECK-NOT: {{:}}
RUN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \
-RUN: | llvm-dwarfdump -debug-info=0 - | FileCheck --allow-empty --check-prefix=EMPTY %s
+RUN: | llvm-dwarfdump -debug-info=0 - \
+RUN: | FileCheck --allow-empty --check-prefix=EMPTY %s
EMPTY-NOT: DW_TAG
+
+RUN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \
+RUN: | llvm-dwarfdump -debug-info=0x0000000b -c - \
+RUN: | FileCheck %s --check-prefix=CHILDREN
+
+UN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \
+UN: | llvm-dwarfdump -debug-info=0x0000000b --show-children - \
+UN: | FileCheck %s --check-prefix=CHILDREN
+CHILDREN: .debug_info contents:
+CHILDREN: 0x0000000b: DW_TAG_compile_unit
+CHILDREN: DW_TAG_subprogram
diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_type_offset.test b/llvm/test/tools/llvm-dwarfdump/X86/debug_type_offset.test
index b1fcad4..5be0bff 100644
--- a/llvm/test/tools/llvm-dwarfdump/X86/debug_type_offset.test
+++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_type_offset.test
@@ -6,3 +6,12 @@
CHECK: 0x00000019: DW_TAG_structure_type
CHECK: DW_AT_visibility
CHECK-NOT: {{:}}
+
+RUN: llvm-mc %S/../../../DebugInfo/Inputs/typeunit-header.s -filetype obj \
+RUN: -triple x86_64-unknown-elf -o - \
+RUN: | llvm-dwarfdump -c -debug-types=0x0000017 - \
+RUN: | FileCheck %s --check-prefix=CHILDREN
+CHILDREN: .debug_types contents:
+CHILDREN: 0x00000017: DW_TAG_type_unit
+CHILDREN: 0x00000019: DW_TAG_structure_type
+CHECK-NOT: {{:}}
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index 0ac3354..7251521 100644
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -127,6 +127,12 @@
static alias DumpUUIDAlias("u", desc("Alias for -uuid"), aliasopt(DumpUUID));
static opt<bool>
+ ShowChildren("show-children",
+ desc("Show a debug info entry's children when selectively "
+ "printing with the =<Offset> option"));
+static alias ShowChildrenAlias("c", desc("Alias for -show-children"),
+ aliasopt(ShowChildren));
+static opt<bool>
SummarizeTypes("summarize-types",
desc("Abbreviate the description of type unit entries"));
static opt<bool> Verify("verify", desc("Verify the DWARF debug info"),
@@ -153,6 +159,7 @@
static DIDumpOptions getDumpOpts() {
DIDumpOptions DumpOpts;
DumpOpts.DumpType = DumpType;
+ DumpOpts.ShowChildren = ShowChildren;
DumpOpts.SummarizeTypes = SummarizeTypes;
DumpOpts.Verbose = Verbose;
return DumpOpts;