changed naming, changed index

Author: ayermolo

llvm/include/llvm/CodeGen/AccelTable.h

@@ -284,7 +284,7 @@ class DWARF5AccelTableData : public AccelTableData {
                        const unsigned DieTag, const unsigned UnitID,
                        const bool IsTU = false)
       : OffsetVal(DieOffset), ParentOffset(DefiningParentOffset),
-        DieTag(DieTag), AbbrevID(0), IsTU(IsTU), UnitID(UnitID) {}
+        DieTag(DieTag), AbbrevNumber(0), IsTU(IsTU), UnitID(UnitID) {}
 
 #ifndef NDEBUG
   void print(raw_ostream &OS) const override;
@@ -326,10 +326,10 @@ class DWARF5AccelTableData : public AccelTableData {
   }
 
   /// Sets AbbrevIndex for an Entry.
-  void setAbbrevIndex(uint16_t AbbrevIndex) { AbbrevID = AbbrevIndex; }
+  void setAbbrevNumber(uint16_t AbbrevNum) { AbbrevNumber = AbbrevNum; }
 
   /// Returns AbbrevIndex for an Entry.
-  uint16_t getAbbrevIndex() const { return AbbrevID; }
+  uint16_t getAbbrevNumber() const { return AbbrevNumber; }
 
   /// If `Die` has a non-null parent and the parent is not a declaration,
   /// return its offset.
@@ -339,7 +339,7 @@ class DWARF5AccelTableData : public AccelTableData {
   std::variant<const DIE *, uint64_t> OffsetVal;
   std::optional<uint64_t> ParentOffset;
   uint32_t DieTag : 16;
-  uint32_t AbbrevID : 15;
+  uint32_t AbbrevNumber : 15;
   uint32_t IsTU : 1;
   uint32_t UnitID;
   uint64_t order() const override { return getDieOffset(); }
@@ -348,7 +348,7 @@ class DWARF5AccelTableData : public AccelTableData {
 class DebugNamesAbbrev : public FoldingSetNode {
 public:
   uint32_t DieTag;
-  uint32_t Index;
+  uint32_t Number;
   struct AttributeEncoding {
     dwarf::Index Index;
     dwarf::Form Form;
@@ -359,9 +359,9 @@ class DebugNamesAbbrev : public FoldingSetNode {
     AttrVect.push_back(Attr);
   }
   /// Set abbreviation tag index.
-  void setAbbrevTagIndex(uint32_t AbbrevIndex) { Index = AbbrevIndex; }
+  void setNumber(uint32_t AbbrevNumber) { Number = AbbrevNumber; }
   /// Get abbreviation tag index.
-  uint32_t getAbbrevTagIndex() const { return Index; }
+  uint32_t getNumber() const { return Number; }
   /// Get DIE Tag.
   uint32_t getDieTag() const { return DieTag; }
   /// Used to gather unique data for the abbreviation folding set.

llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp

@@ -455,15 +455,15 @@ void Dwarf5AccelTableWriter::populateAbbrevsMap() {
         void *InsertPos;
         if (DebugNamesAbbrev *Existing =
                 AbbreviationsSet.FindNodeOrInsertPos(ID, InsertPos)) {
-          Value->setAbbrevIndex(Existing->getAbbrevTagIndex());
+          Value->setAbbrevNumber(Existing->getNumber());
           continue;
         }
         DebugNamesAbbrev *NewAbbrev =
             new (Alloc) DebugNamesAbbrev(std::move(Abbrev));
-        NewAbbrev->setAbbrevTagIndex(AbbreviationsVector.size());
         AbbreviationsVector.push_back(NewAbbrev);
+        NewAbbrev->setNumber(AbbreviationsVector.size());
         AbbreviationsSet.InsertNode(NewAbbrev, InsertPos);
-        Value->setAbbrevIndex(NewAbbrev->getAbbrevTagIndex());
+        Value->setAbbrevNumber(NewAbbrev->getNumber());
       }
     }
   }
@@ -515,7 +515,7 @@ void Dwarf5AccelTableWriter::emitAbbrevs() const {
   Asm->OutStreamer->emitLabel(AbbrevStart);
   for (const DebugNamesAbbrev *Abbrev : AbbreviationsVector) {
     Asm->OutStreamer->AddComment("Abbrev code");
-    Asm->emitULEB128(Abbrev->getAbbrevTagIndex() + 1);
+    Asm->emitULEB128(Abbrev->getNumber());
     Asm->OutStreamer->AddComment(dwarf::TagString(Abbrev->getDieTag()));
     Asm->emitULEB128(Abbrev->getDieTag());
     for (const DebugNamesAbbrev::AttributeEncoding &AttrEnc :
@@ -535,9 +535,10 @@ void Dwarf5AccelTableWriter::emitEntry(
     const DWARF5AccelTableData &Entry,
     const DenseMap<OffsetAndUnitID, MCSymbol *> &DIEOffsetToAccelEntryLabel,
     DenseSet<MCSymbol *> &EmittedAccelEntrySymbols) {
-  assert(Entry.getAbbrevIndex() < AbbreviationsVector.size() &&
+  unsigned AbbrevIndex = Entry.getAbbrevNumber() - 1;
+  assert(AbbrevIndex < AbbreviationsVector.size() &&
          "Entry abbrev index is outside of abbreviations vector range.");
-  DebugNamesAbbrev *Abbrev = AbbreviationsVector[Entry.getAbbrevIndex()];
+  DebugNamesAbbrev *Abbrev = AbbreviationsVector[AbbrevIndex];
   std::optional<DWARF5AccelTable::UnitIndexAndEncoding> EntryRet =
       getIndexForEntry(Entry);
   std::optional<OffsetAndUnitID> MaybeParentOffset =
@@ -553,7 +554,7 @@ void Dwarf5AccelTableWriter::emitEntry(
   if (EmittedAccelEntrySymbols.insert(EntrySymbol).second)
     Asm->OutStreamer->emitLabel(EntrySymbol);
 
-  Asm->emitULEB128(Entry.getAbbrevIndex() + 1, "Abbreviation code");
+  Asm->emitULEB128(Entry.getAbbrevNumber(), "Abbreviation code");
 
   for (const DebugNamesAbbrev::AttributeEncoding &AttrEnc :
        Abbrev->getAttributes()) {