Revert "[AccelTable] Provide abstraction for emitting DWARF5 accelerator tables."

This reverts r336529 because an alternative approach turned out to be a
better fit for dsymuil.

llvm-svn: 336698

diff --git a/llvm/include/llvm/CodeGen/AccelTable.h b/llvm/include/llvm/CodeGen/AccelTable.h
index 1c70c4db8e2e161fdcf3f20f854f89d7278d8a27..d5088b3ce1404c128bf6afa31ede3e05f454d633 100644 (file)
--- a/llvm/include/llvm/CodeGen/AccelTable.h
+++ b/llvm/include/llvm/CodeGen/AccelTable.h
@@ -122,8 +122,8 @@ public:
     return order() < Other.order();
   }
 
-    // Subclasses should implement:
-    // static uint32_t hash(StringRef Name);
+  // Subclasses should implement:
+  // static uint32_t hash(StringRef Name);
 
 #ifndef NDEBUG
   virtual void print(raw_ostream &OS) const = 0;
@@ -287,25 +287,6 @@ void emitDWARF5AccelTable(AsmPrinter *Asm,
                           const DwarfDebug &DD,
                           ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs);
 
-/// Abstraction to allow different users (DwarfDebug and dsymutil) to emit
-/// Dwarf accelerator tables.
-class AccelTableWriterInfo {
-public:
-  virtual ~AccelTableWriterInfo() = default;
-  virtual MCSymbol* getLabelForCU(unsigned Idx) const = 0;
-  virtual unsigned getNumberOfCUs() const = 0;
-  virtual unsigned getUnqiueIDForUnitDie(const DIE* UnitDie) const = 0;
-};
-
-void emitDWARF5AccelTable(AsmPrinter *Asm,
-                          AccelTable<DWARF5AccelTableData> &Contents,
-                          const DwarfDebug &DD,
-                          ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs);
-
-void emitDWARF5AccelTable(
-    AsmPrinter *Asm, AccelTable<DWARF5AccelTableData> &Contents,
-    std::unique_ptr<AccelTableWriterInfo> WriterInfo);
-
 /// Accelerator table data implementation for simple Apple accelerator tables
 /// with just a DIE reference.
 class AppleAccelTableOffsetData : public AppleAccelTableData {

diff --git a/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp b/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp
index a14c646b924af457cfce7dd13228bacf50859c94..48c78af8ff4a109389e7f1eb223e51395dfaa2bf 100644 (file)
--- a/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp
@@ -209,7 +209,8 @@ class Dwarf5AccelTableWriter : public AccelTableWriter {
 
   Header Header;
   DenseMap<uint32_t, SmallVector<AttributeEncoding, 2>> Abbreviations;
-  std::unique_ptr<AccelTableWriterInfo> WriterInfo;
+  const DwarfDebug &DD;
+  ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits;
   MCSymbol *ContributionStart = Asm->createTempSymbol("names_start");
   MCSymbol *ContributionEnd = Asm->createTempSymbol("names_end");
   MCSymbol *AbbrevStart = Asm->createTempSymbol("names_abbrev_start");
@@ -230,47 +231,13 @@ class Dwarf5AccelTableWriter : public AccelTableWriter {
 
 public:
   Dwarf5AccelTableWriter(AsmPrinter *Asm, const AccelTableBase &Contents,
-                          std::unique_ptr<AccelTableWriterInfo> WriterInfo);
+                         const DwarfDebug &DD,
+                         ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits);
 
   void emit() const;
 };
-
-/// Default emitter info used by DwarfDebug.
-class DefaultAccelTableWriterInfo final : public AccelTableWriterInfo {
-private:
-  const DwarfDebug &DD;
-  ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits;
-
-public:
-  DefaultAccelTableWriterInfo(const DwarfDebug &DD, ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits);
-  MCSymbol *getLabelForCU(unsigned Idx) const override;
-  unsigned getNumberOfCUs() const override;
-  unsigned getUnqiueIDForUnitDie(const DIE *UnitDie) const override;
-};
 } // namespace
 
-DefaultAccelTableWriterInfo::DefaultAccelTableWriterInfo(
-    const DwarfDebug &DD, ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits)
-    : DD(DD), CompUnits(CompUnits) {}
-
-MCSymbol *DefaultAccelTableWriterInfo::getLabelForCU(unsigned Idx) const {
-  assert(Idx < CompUnits.size());
-  const auto &CU = CompUnits[Idx];
-  assert(Idx == CU->getUniqueID());
-  const DwarfCompileUnit *MainCU =
-      DD.useSplitDwarf() ? CU->getSkeleton() : CU.get();
-  return MainCU->getLabelBegin();
-}
-
-unsigned DefaultAccelTableWriterInfo::getNumberOfCUs() const {
-  return CompUnits.size();
-}
-
-unsigned
-DefaultAccelTableWriterInfo::getUnqiueIDForUnitDie(const DIE *UnitDie) const {
-  return DD.lookupCU(UnitDie)->getUniqueID();
-}
-
 void AccelTableWriter::emitHashes() const {
   uint64_t PrevHash = std::numeric_limits<uint64_t>::max();
   unsigned BucketIdx = 0;
@@ -436,8 +403,8 @@ DenseSet<uint32_t> Dwarf5AccelTableWriter::getUniqueTags() const {
 SmallVector<Dwarf5AccelTableWriter::AttributeEncoding, 2>
 Dwarf5AccelTableWriter::getUniformAttributes() const {
   SmallVector<AttributeEncoding, 2> UA;
-  if (WriterInfo->getNumberOfCUs() > 1) {
-    size_t LargestCUIndex = WriterInfo->getNumberOfCUs() - 1;
+  if (CompUnits.size() > 1) {
+    size_t LargestCUIndex = CompUnits.size() - 1;
     dwarf::Form Form = DIEInteger::BestForm(/*IsSigned*/ false, LargestCUIndex);
     UA.push_back({dwarf::DW_IDX_compile_unit, Form});
   }
@@ -446,10 +413,12 @@ Dwarf5AccelTableWriter::getUniformAttributes() const {
 }
 
 void Dwarf5AccelTableWriter::emitCUList() const {
-  for (unsigned Idx = 0, CUs = WriterInfo->getNumberOfCUs(); Idx < CUs;
-       ++Idx) {
-    Asm->OutStreamer->AddComment("Compilation unit " + Twine(Idx));
-    Asm->emitDwarfSymbolReference(WriterInfo->getLabelForCU(Idx));
+  for (const auto &CU : enumerate(CompUnits)) {
+    assert(CU.index() == CU.value()->getUniqueID());
+    Asm->OutStreamer->AddComment("Compilation unit " + Twine(CU.index()));
+    const DwarfCompileUnit *MainCU =
+        DD.useSplitDwarf() ? CU.value()->getSkeleton() : CU.value().get();
+    Asm->emitDwarfSymbolReference(MainCU->getLabelBegin());
   }
 }
 
@@ -505,7 +474,7 @@ void Dwarf5AccelTableWriter::emitEntry(
     switch (AttrEnc.Index) {
     case dwarf::DW_IDX_compile_unit: {
       const DIE *CUDie = Entry.getDie().getUnitDie();
-      DIEInteger ID(WriterInfo->getUnqiueIDForUnitDie(CUDie));
+      DIEInteger ID(DD.lookupCU(CUDie)->getUniqueID());
       ID.EmitValue(Asm, AttrEnc.Form);
       break;
     }
@@ -534,12 +503,12 @@ void Dwarf5AccelTableWriter::emitData() const {
 }
 
 Dwarf5AccelTableWriter::Dwarf5AccelTableWriter(
-    AsmPrinter *Asm, const AccelTableBase &Contents,
-    std::unique_ptr<AccelTableWriterInfo> WriterInfo)
+    AsmPrinter *Asm, const AccelTableBase &Contents, const DwarfDebug &DD,
+    ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits)
     : AccelTableWriter(Asm, Contents, false),
-      Header(WriterInfo->getNumberOfCUs(), Contents.getBucketCount(),
+      Header(CompUnits.size(), Contents.getBucketCount(),
              Contents.getUniqueNameCount()),
-      WriterInfo(std::move(WriterInfo)) {
+      DD(DD), CompUnits(CompUnits) {
   DenseSet<uint32_t> UniqueTags = getUniqueTags();
   SmallVector<AttributeEncoding, 2> UniformAttributes = getUniformAttributes();
 
@@ -571,15 +540,8 @@ void llvm::emitAppleAccelTableImpl(AsmPrinter *Asm, AccelTableBase &Contents,
 void llvm::emitDWARF5AccelTable(
     AsmPrinter *Asm, AccelTable<DWARF5AccelTableData> &Contents,
     const DwarfDebug &DD, ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs) {
-  auto WriterInfo = llvm::make_unique<DefaultAccelTableWriterInfo>(DD, CUs);
-  emitDWARF5AccelTable(Asm, Contents, std::move(WriterInfo));
-}
-
-void llvm::emitDWARF5AccelTable(
-    AsmPrinter *Asm, AccelTable<DWARF5AccelTableData> &Contents,
-    std::unique_ptr<AccelTableWriterInfo> WriterInfo) {
   Contents.finalize(Asm, "names");
-  Dwarf5AccelTableWriter(Asm, Contents, std::move(WriterInfo)).emit();
+  Dwarf5AccelTableWriter(Asm, Contents, DD, CUs).emit();
 }
 
 void AppleAccelTableOffsetData::emit(AsmPrinter *Asm) const {