Revert "llvm-dwarfdump: Add support for -debug-info=<offset>."

This reverts commit r313412 because of a g++ incompatibility.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313413 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/DebugInfo/DIContext.h b/include/llvm/DebugInfo/DIContext.h
index 59f8e297296b16467866201a390ba4599f55fbde..c7429069873b92ceb701f033553dee0131a2a2f8 100644 (file)
--- a/include/llvm/DebugInfo/DIContext.h
+++ b/include/llvm/DebugInfo/DIContext.h
@@ -114,6 +114,7 @@ struct DILineInfoSpecifier {
 
 /// This is just a helper to programmatically construct DIDumpType.
 enum DIDumpTypeCounter {
+  DIDT_ID_Null = 0,
 #define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \
   DIDT_ID_##ENUM_NAME,
 #include "llvm/BinaryFormat/Dwarf.def"
@@ -128,10 +129,10 @@ enum DIDumpType : unsigned {
   DIDT_Null,
   DIDT_All             = ~0U,
 #define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME) \
-  DIDT_##ENUM_NAME = 1U << DIDT_ID_##ENUM_NAME,
+  DIDT_##ENUM_NAME = 1U << (DIDT_ID_##ENUM_NAME - 1),
 #include "llvm/BinaryFormat/Dwarf.def"
 #undef HANDLE_DWARF_SECTION
-  DIDT_UUID = 1 << DIDT_ID_UUID,
+  DIDT_UUID = 1 << (DIDT_ID_UUID - 1),
 };
 
 /// Container for dump options that control which debug information will be

diff --git a/include/llvm/DebugInfo/DWARF/DWARFContext.h b/include/llvm/DebugInfo/DWARF/DWARFContext.h
index e43a9ba8adf0e4180ee49ea57a64d3967a5ba39a..a89d883ee0ba134aa3864748a2ffbc4c1c4e455c 100644 (file)
--- a/include/llvm/DebugInfo/DWARF/DWARFContext.h
+++ b/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -121,15 +121,7 @@ public:
     return DICtx->getKind() == CK_DWARF;
   }
 
-  /// Dump a textual representation to \p OS. If any \p DumpOffsets are present,
-  /// dump only the record at the specified offset.
-  void dump(raw_ostream &OS, DIDumpOptions DumpOpts,
-            std::array<Optional<uint64_t>, DIDT_ID_Count> DumpOffsets);
-
-  void dump(raw_ostream &OS, DIDumpOptions DumpOpts) override {
-    std::array<Optional<uint64_t>, DIDT_ID_Count> DumpOffsets;
-    dump(OS, DumpOpts, DumpOffsets);
-  }
+  void dump(raw_ostream &OS, DIDumpOptions DumpOpts) override;
 
   bool verify(raw_ostream &OS, unsigned DumpType = DIDT_All,
               DIDumpOptions DumpOpts = {}) override;

diff --git a/lib/DebugInfo/DWARF/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp
index 3914b5a441aef29057587a634715091571325f96..c9832f43c24418ba31399e8d8da85eb208c7074a 100644 (file)
--- a/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -216,11 +216,7 @@ static void dumpStringOffsetsSection(raw_ostream &OS, StringRef SectionName,
   }
 }
 
-void DWARFContext::dump(
-    raw_ostream &OS, DIDumpOptions DumpOpts,
-    std::array<Optional<uint64_t>, DIDT_ID_Count> DumpOffsets) {
-
-  Optional<uint64_t> DumpOffset;
+void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
   uint64_t DumpType = DumpOpts.DumpType;
   bool DumpEH = DumpOpts.DumpEH;
 
@@ -234,41 +230,37 @@ void DWARFContext::dump(
 
   // Print a header for each explicitly-requested section.
   // Otherwise just print one for non-empty sections.
-  // Only print empty .dwo section headers when dumping a .dwo file.
   bool Explicit = DumpType != DIDT_All && !IsDWO;
-  bool ExplicitDWO = Explicit && IsDWO;
-  auto shouldDump = [&](bool Explicit, const char *Name, unsigned ID,
-                        StringRef Section) {
-    DumpOffset = DumpOffsets[ID];
-    unsigned Mask = 1U << ID;
-    bool Should = (DumpType & Mask) && (Explicit || !Section.empty());
+  auto shouldDump = [&](bool IsExplicit, const char *Name,
+                        unsigned DIDT_Section, StringRef Section) {
+    bool Should = (DumpType & DIDT_Section) && (IsExplicit || !Section.empty());
     if (Should)
-      OS << "\n" << Name << " contents:\n";
+      OS << '\n' << Name << " contents:\n";
     return Should;
   };
+  // Only print empty .dwo section headers when dumping a .dwo file.
+  bool ExplicitDWO = Explicit && IsDWO;
 
   // Dump individual sections.
-  if (shouldDump(Explicit, ".debug_abbrev", DIDT_ID_DebugAbbrev,
-                 DObj->getAbbrevSection()))
+  if (shouldDump(Explicit, ".debug_abbrev", DIDT_DebugAbbrev,
+                 DObj->getAbbrevSection())) {
     getDebugAbbrev()->dump(OS);
-  if (shouldDump(ExplicitDWO, ".debug_abbrev.dwo", DIDT_ID_DebugAbbrev,
-                 DObj->getAbbrevDWOSection()))
+  }
+  if (shouldDump(ExplicitDWO, ".debug_abbrev.dwo", DIDT_DebugAbbrev,
+                 DObj->getAbbrevDWOSection())) {
     getDebugAbbrevDWO()->dump(OS);
+  }
 
-  auto dumpDebugInfo = [&](bool IsExplicit, const char *Name,
-                           DWARFSection Section, cu_iterator_range CUs) {
-    if (shouldDump(IsExplicit, Name, DIDT_ID_DebugInfo, Section.Data)) {
-      for (const auto &CU : CUs)
-        if (DumpOffset)
-        CU->getDIEForOffset(DumpOffset.getValue()).dump(OS, 0);
-        else
-          CU->dump(OS, DumpOpts);
-    }
-  };
-  dumpDebugInfo(Explicit, ".debug_info", DObj->getInfoSection(),
-                compile_units());
-  dumpDebugInfo(ExplicitDWO, ".debug_info.dwo", DObj->getInfoDWOSection(),
-                dwo_compile_units());
+  if (shouldDump(Explicit, ".debug_info", DIDT_DebugInfo,
+                 DObj->getInfoSection().Data)) {
+    for (const auto &CU : compile_units())
+      CU->dump(OS, DumpOpts);
+  }
+  if (shouldDump(ExplicitDWO, ".debug_info.dwo", DIDT_DebugInfo,
+                 DObj->getInfoDWOSection().Data)) {
+    for (const auto &DWOCU : dwo_compile_units())
+      DWOCU->dump(OS, DumpOpts);
+  }
 
   if ((DumpType & DIDT_DebugTypes)) {
     if (Explicit || getNumTypeUnits()) {
@@ -285,16 +277,16 @@ void DWARFContext::dump(
     }
   }
 
-  if (shouldDump(Explicit, ".debug_loc", DIDT_ID_DebugLoc,
+  if (shouldDump(Explicit, ".debug_loc", DIDT_DebugLoc,
                  DObj->getLocSection().Data)) {
     getDebugLoc()->dump(OS, getRegisterInfo());
   }
-  if (shouldDump(ExplicitDWO, ".debug_loc.dwo", DIDT_ID_DebugLoc,
+  if (shouldDump(ExplicitDWO, ".debug_loc.dwo", DIDT_DebugLoc,
                  DObj->getLocDWOSection().Data)) {
     getDebugLocDWO()->dump(OS, getRegisterInfo());
   }
 
-  if (shouldDump(Explicit, ".debug_frame", DIDT_ID_DebugFrames,
+  if (shouldDump(Explicit, ".debug_frame", DIDT_DebugFrames,
                  DObj->getDebugFrameSection())) {
     getDebugFrame()->dump(OS);
   }
@@ -310,7 +302,7 @@ void DWARFContext::dump(
     }
   }
 
-  if (shouldDump(Explicit, ".debug_aranges", DIDT_ID_DebugAranges,
+  if (shouldDump(Explicit, ".debug_aranges", DIDT_DebugAranges,
                  DObj->getARangeSection())) {
     uint32_t offset = 0;
     DataExtractor arangesData(DObj->getARangeSection(), isLittleEndian(), 0);
@@ -320,7 +312,7 @@ void DWARFContext::dump(
   }
 
   uint8_t savedAddressByteSize = 0;
-  if (shouldDump(Explicit, ".debug_line", DIDT_ID_DebugLine,
+  if (shouldDump(Explicit, ".debug_line", DIDT_DebugLine,
                  DObj->getLineSection().Data)) {
     for (const auto &CU : compile_units()) {
       savedAddressByteSize = CU->getAddressByteSize();
@@ -343,7 +335,7 @@ void DWARFContext::dump(
     savedAddressByteSize = CU->getAddressByteSize();
     break;
   }
-  if (shouldDump(ExplicitDWO, ".debug_line.dwo", DIDT_ID_DebugLine,
+  if (shouldDump(ExplicitDWO, ".debug_line.dwo", DIDT_DebugLine,
                  DObj->getLineDWOSection().Data)) {
     unsigned stmtOffset = 0;
     DWARFDataExtractor lineData(*DObj, DObj->getLineDWOSection(),
@@ -355,17 +347,17 @@ void DWARFContext::dump(
     }
   }
 
-  if (shouldDump(Explicit, ".debug_cu_index", DIDT_ID_DebugCUIndex,
+  if (shouldDump(Explicit, ".debug_cu_index", DIDT_DebugCUIndex,
                  DObj->getCUIndexSection())) {
     getCUIndex().dump(OS);
   }
 
-  if (shouldDump(Explicit, ".debug_tu_index", DIDT_ID_DebugTUIndex,
+  if (shouldDump(Explicit, ".debug_tu_index", DIDT_DebugTUIndex,
                  DObj->getTUIndexSection())) {
     getTUIndex().dump(OS);
   }
 
-  if (shouldDump(Explicit, ".debug_str", DIDT_ID_DebugStr,
+  if (shouldDump(Explicit, ".debug_str", DIDT_DebugStr,
                  DObj->getStringSection())) {
     DataExtractor strData(DObj->getStringSection(), isLittleEndian(), 0);
     uint32_t offset = 0;
@@ -375,7 +367,7 @@ void DWARFContext::dump(
       strOffset = offset;
     }
   }
-  if (shouldDump(ExplicitDWO, ".debug_str.dwo", DIDT_ID_DebugStr,
+  if (shouldDump(ExplicitDWO, ".debug_str.dwo", DIDT_DebugStr,
                  DObj->getStringDWOSection())) {
     DataExtractor strDWOData(DObj->getStringDWOSection(), isLittleEndian(), 0);
     uint32_t offset = 0;
@@ -386,7 +378,7 @@ void DWARFContext::dump(
     }
   }
 
-  if (shouldDump(Explicit, ".debug_ranges", DIDT_ID_DebugRanges,
+  if (shouldDump(Explicit, ".debug_ranges", DIDT_DebugRanges,
                  DObj->getRangeSection().Data)) {
     // In fact, different compile units may have different address byte
     // sizes, but for simplicity we just use the address byte size of the
@@ -401,60 +393,60 @@ void DWARFContext::dump(
       rangeList.dump(OS);
   }
 
-  if (shouldDump(Explicit, ".debug_pubnames", DIDT_ID_DebugPubnames,
+  if (shouldDump(Explicit, ".debug_pubnames", DIDT_DebugPubnames,
                  DObj->getPubNamesSection()))
     DWARFDebugPubTable(DObj->getPubNamesSection(), isLittleEndian(), false)
         .dump(OS);
 
-  if (shouldDump(Explicit, ".debug_pubtypes", DIDT_ID_DebugPubtypes,
+  if (shouldDump(Explicit, ".debug_pubtypes", DIDT_DebugPubtypes,
                  DObj->getPubTypesSection()))
     DWARFDebugPubTable(DObj->getPubTypesSection(), isLittleEndian(), false)
         .dump(OS);
 
-  if (shouldDump(Explicit, ".debug_gnu_pubnames", DIDT_ID_DebugGnuPubnames,
+  if (shouldDump(Explicit, ".debug_gnu_pubnames", DIDT_DebugGnuPubnames,
                  DObj->getGnuPubNamesSection()))
     DWARFDebugPubTable(DObj->getGnuPubNamesSection(), isLittleEndian(),
                        true /* GnuStyle */)
         .dump(OS);
 
-  if (shouldDump(Explicit, ".debug_gnu_pubtypes", DIDT_ID_DebugGnuPubtypes,
+  if (shouldDump(Explicit, ".debug_gnu_pubtypes", DIDT_DebugGnuPubtypes,
                  DObj->getGnuPubTypesSection()))
     DWARFDebugPubTable(DObj->getGnuPubTypesSection(), isLittleEndian(),
                        true /* GnuStyle */)
         .dump(OS);
 
-  if (shouldDump(Explicit, ".debug_str_offsets", DIDT_ID_DebugStrOffsets,
+  if (shouldDump(Explicit, ".debug_str_offsets", DIDT_DebugStrOffsets,
                  DObj->getStringOffsetSection().Data))
     dumpStringOffsetsSection(
         OS, "debug_str_offsets", *DObj, DObj->getStringOffsetSection(),
         DObj->getStringSection(), isLittleEndian(), getMaxVersion());
-  if (shouldDump(ExplicitDWO, ".debug_str_offsets.dwo", DIDT_ID_DebugStrOffsets,
+  if (shouldDump(ExplicitDWO, ".debug_str_offsets.dwo", DIDT_DebugStrOffsets,
                  DObj->getStringOffsetDWOSection().Data))
     dumpStringOffsetsSection(
         OS, "debug_str_offsets.dwo", *DObj, DObj->getStringOffsetDWOSection(),
         DObj->getStringDWOSection(), isLittleEndian(), getMaxVersion());
 
-  if (shouldDump(Explicit, ".gnu_index", DIDT_ID_GdbIndex,
+  if (shouldDump(Explicit, ".gnu_index", DIDT_GdbIndex,
                  DObj->getGdbIndexSection())) {
     getGdbIndex().dump(OS);
   }
 
-  if (shouldDump(Explicit, ".apple_names", DIDT_ID_AppleNames,
+  if (shouldDump(Explicit, ".apple_names", DIDT_AppleNames,
                  DObj->getAppleNamesSection().Data))
     dumpAccelSection(OS, *DObj, DObj->getAppleNamesSection(),
                      DObj->getStringSection(), isLittleEndian());
 
-  if (shouldDump(Explicit, ".apple_types", DIDT_ID_AppleTypes,
+  if (shouldDump(Explicit, ".apple_types", DIDT_AppleTypes,
                  DObj->getAppleTypesSection().Data))
     dumpAccelSection(OS, *DObj, DObj->getAppleTypesSection(),
                      DObj->getStringSection(), isLittleEndian());
 
-  if (shouldDump(Explicit, ".apple_namespaces", DIDT_ID_AppleNamespaces,
+  if (shouldDump(Explicit, ".apple_namespaces", DIDT_AppleNamespaces,
                  DObj->getAppleNamespacesSection().Data))
     dumpAccelSection(OS, *DObj, DObj->getAppleNamespacesSection(),
                      DObj->getStringSection(), isLittleEndian());
 
-  if (shouldDump(Explicit, ".apple_objc", DIDT_ID_AppleObjC,
+  if (shouldDump(Explicit, ".apple_objc", DIDT_AppleObjC,
                  DObj->getAppleObjCSection().Data))
     dumpAccelSection(OS, *DObj, DObj->getAppleObjCSection(),
                      DObj->getStringSection(), isLittleEndian());

diff --git a/test/tools/llvm-dwarfdump/X86/debug_info_offset.test b/test/tools/llvm-dwarfdump/X86/debug_info_offset.test
deleted file mode 100644 (file)
index d3d1b6a..0000000
--- a/test/tools/llvm-dwarfdump/X86/debug_info_offset.test
+++ /dev/null
@@ -1,10 +0,0 @@
-RUN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \
-RUN:   | llvm-dwarfdump -debug-info=0x0000000b - | FileCheck %s
-CHECK: .debug_info contents:
-CHECK: 0x0000000b: DW_TAG_compile_unit
-CHECK:               DW_AT_name
-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
-EMPTY-NOT: DW_TAG

diff --git a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index 7671bd8adafbcefffdd78a8d30a5b4a2716bfbd4..823eb8e81334f5831319d77811d0e8b1b715a451 100644 (file)
--- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -37,59 +37,8 @@
 using namespace llvm;
 using namespace object;
 
-/// Parser for options that take an optional offest argument.
-/// @{
-struct OffsetOption {
-  uint64_t Val = 0;
-  bool HasValue = false;
-  bool IsRequested = false;
-};
-
-template <>
-class cl::parser<OffsetOption> final : public cl::basic_parser<OffsetOption> {
-public:
-  parser(Option &O) : basic_parser(O) {}
-
-  /// Return true on error.
-  bool parse(Option &O, StringRef ArgName, StringRef Arg, OffsetOption &Val) {
-    if (Arg == "") {
-      Val.Val = 0;
-      Val.HasValue = false;
-      Val.IsRequested = true;
-      return false;
-    }
-    if (Arg.getAsInteger(0, Val.Val))
-      return O.error("'" + Arg + "' value invalid for integer argument!");
-    Val.HasValue = true;
-    Val.IsRequested = true;
-    return false;
-  }
-
-  enum ValueExpected getValueExpectedFlagDefault() const {
-    return ValueOptional;
-  }
-
-  void printOptionInfo(const Option &O, size_t GlobalWidth) const {
-    outs() << "  -" << O.ArgStr;
-    Option::printHelpStr(O.HelpStr, GlobalWidth, getOptionWidth(O));
-  }
-
-  void printOptionDiff(const Option &O, OffsetOption V, OptVal Default,
-                       size_t GlobalWidth) const {
-    printOptionName(O, GlobalWidth);
-    outs() << "[=offset]";
-  }
-
-  // An out-of-line virtual method to provide a 'home' for this class.
-  void anchor() override {};
-};
-
-/// @}
-/// Command line options.
-/// @{
-
 namespace {
-using namespace cl;
+using namespace llvm::cl;
 
 OptionCategory DwarfDumpCategory("Specific Options");
 static opt<bool> Help("h", desc("Alias for -help"), Hidden,
@@ -98,26 +47,20 @@ static list<std::string>
     InputFilenames(Positional, desc("<input object files or .dSYM bundles>"),
                    ZeroOrMore, cat(DwarfDumpCategory));
 
-cl::OptionCategory SectionCategory("Section-specific Dump Options",
-                                   "These control which sections are dumped. "
-                                   "Where applicable these parameters take an "
-                                   "optional =<offset> argument to dump only "
-                                   "the entry at the specified offset.");
-
+cl::OptionCategory
+    SectionCategory("Section-specific Dump Options",
+                    "These control which sections are dumped.");
 static opt<bool> DumpAll("all", desc("Dump all debug info sections"),
                          cat(SectionCategory));
 static alias DumpAllAlias("a", desc("Alias for -all"), aliasopt(DumpAll));
 
-// Options for dumping specific sections.
 static unsigned DumpType = DIDT_Null;
-static std::array<Optional<uint64_t>, DIDT_ID_Count> DumpOffsets;
 #define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME)                \
-  static opt<OffsetOption> Dump##ENUM_NAME(                                    \
-      CMDLINE_NAME, desc("Dump the " ELF_NAME " section"),                     \
-      cat(SectionCategory));
+  static opt<bool> Dump##ENUM_NAME(CMDLINE_NAME,                               \
+                                   desc("Dump the " ELF_NAME " section"),      \
+                                   cat(SectionCategory));
 #include "llvm/BinaryFormat/Dwarf.def"
 #undef HANDLE_DWARF_SECTION
-
 static opt<bool> DumpUUID("uuid", desc("Show the UUID for each architecture"),
                           cat(DwarfDumpCategory));
 static alias DumpUUIDAlias("u", desc("Alias for -uuid"), aliasopt(DumpUUID));
@@ -135,9 +78,6 @@ static opt<bool> Verbose("verbose",
 static alias VerboseAlias("v", desc("Alias for -verbose"), aliasopt(Verbose),
                           cat(DwarfDumpCategory));
 } // namespace
-/// @}
-//===----------------------------------------------------------------------===//
-
 
 static void error(StringRef Filename, std::error_code EC) {
   if (!EC)
@@ -163,7 +103,7 @@ static bool dumpObjectFile(ObjectFile &Obj, Twine Filename) {
     outs() << Filename << ":\tfile format " << Obj.getFileFormatName() << '\n';
 
   // Dump the complete DWARF structure.
-  DICtx->dump(outs(), getDumpOpts(), DumpOffsets);
+  DICtx->dump(outs(), getDumpOpts());
   return true;
 }
 
@@ -297,11 +237,8 @@ int main(int argc, char **argv) {
   // Defaults to dumping all sections, unless brief mode is specified in which
   // case only the .debug_info section in dumped.
 #define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME)                \
-  if (Dump##ENUM_NAME.IsRequested) {                                           \
-    DumpType |= DIDT_##ENUM_NAME;                                              \
-    if (Dump##ENUM_NAME.HasValue)                                              \
-      DumpOffsets[DIDT_ID_##ENUM_NAME] = Dump##ENUM_NAME.Val;                  \
-  }
+  if (Dump##ENUM_NAME)                                                         \
+    DumpType |= DIDT_##ENUM_NAME;
 #include "llvm/BinaryFormat/Dwarf.def"
 #undef HANDLE_DWARF_SECTION
   if (DumpUUID)