[dwarfdump] Improve -diff option by hiding more data.
The -diff option makes it easy to diff dwarf by hiding addresses and
offsets. However not all of them were hidden, which should be fixed by
this patch.
Differential revision: https://reviews.llvm.org/D51593
llvm-svn: 341377
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
index 654d205..35567d0 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -244,15 +244,17 @@
else
formValue.dump(OS, DumpOpts);
+ std::string Space = DumpOpts.ShowAddresses ? " " : "";
+
// We have dumped the attribute raw value. For some attributes
// having both the raw value and the pretty-printed value is
// interesting. These attributes are handled below.
if (Attr == DW_AT_specification || Attr == DW_AT_abstract_origin) {
if (const char *Name = Die.getAttributeValueAsReferencedDie(Attr).getName(
DINameKind::LinkageName))
- OS << " \"" << Name << '\"';
+ OS << Space << "\"" << Name << '\"';
} else if (Attr == DW_AT_type) {
- OS << " \"";
+ OS << Space << "\"";
dumpTypeName(OS, Die);
OS << '"';
} else if (Attr == DW_AT_APPLE_property_attribute) {
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp b/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp
index 1aa43c6..27895da 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp
@@ -387,16 +387,16 @@
switch (Form) {
case DW_FORM_exprloc:
case DW_FORM_block:
- OS << format("<0x%" PRIx64 "> ", UValue);
+ AddrOS << format("<0x%" PRIx64 "> ", UValue);
break;
case DW_FORM_block1:
- OS << format("<0x%2.2x> ", (uint8_t)UValue);
+ AddrOS << format("<0x%2.2x> ", (uint8_t)UValue);
break;
case DW_FORM_block2:
- OS << format("<0x%4.4x> ", (uint16_t)UValue);
+ AddrOS << format("<0x%4.4x> ", (uint16_t)UValue);
break;
case DW_FORM_block4:
- OS << format("<0x%8.8x> ", (uint32_t)UValue);
+ AddrOS << format("<0x%8.8x> ", (uint32_t)UValue);
break;
default:
break;
@@ -407,7 +407,7 @@
// UValue contains size of block
const uint8_t *EndDataPtr = DataPtr + UValue;
while (DataPtr < EndDataPtr) {
- OS << format("%2.2x ", *DataPtr);
+ AddrOS << format("%2.2x ", *DataPtr);
++DataPtr;
}
} else
@@ -501,8 +501,9 @@
if (CURelativeOffset) {
if (DumpOpts.Verbose)
OS << " => {";
- WithColor(OS, HighlightColor::Address).get()
- << format("0x%8.8" PRIx64, UValue + (U ? U->getOffset() : 0));
+ if (DumpOpts.ShowAddresses)
+ WithColor(OS, HighlightColor::Address).get()
+ << format("0x%8.8" PRIx64, UValue + (U ? U->getOffset() : 0));
if (DumpOpts.Verbose)
OS << "}";
}