Move IndirectSymbols to MCObjectWriter

Author: rastogishubham

llvm/include/llvm/MC/MCMachObjectWriter.h

@@ -112,11 +112,6 @@ class MachObjectWriter : public MCObjectWriter {
     bool operator<(const MachSymbolData &RHS) const;
   };
 
-  struct IndirectSymbolData {
-    MCSymbol *Symbol;
-    MCSection *Section;
-  };
-
   /// The target specific Mach-O writer instance.
   std::unique_ptr<MCMachObjectTargetWriter> TargetObjectWriter;
 
@@ -137,7 +132,6 @@ class MachObjectWriter : public MCObjectWriter {
 
 private:
   DenseMap<const MCSection *, std::vector<RelAndSymbol>> Relocations;
-  std::vector<IndirectSymbolData> IndirectSymbols;
   DenseMap<const MCSection *, unsigned> IndirectSymBase;
 
   SectionAddrMap SectionAddress;
@@ -200,9 +194,6 @@ class MachObjectWriter : public MCObjectWriter {
 
   bool isFixupKindPCRel(const MCAssembler &Asm, unsigned Kind);
 
-  std::vector<IndirectSymbolData> &getIndirectSymbols() {
-    return IndirectSymbols;
-  }
   const llvm::SmallVectorImpl<MCSection *> &getSectionOrder() const {
     return SectionOrder;
   }

llvm/include/llvm/MC/MCObjectWriter.h

@@ -41,6 +41,13 @@ class MCObjectWriter {
   };
 
 protected:
+  struct IndirectSymbolData {
+    MCSymbol *Symbol;
+    MCSection *Section;
+  };
+
+  std::vector<IndirectSymbolData> IndirectSymbols;
+
   std::vector<DataRegionData> DataRegions;
 
   // The list of linker options for LC_LINKER_OPTION.
@@ -81,6 +88,10 @@ class MCObjectWriter {
     return LinkerOptions;
   }
 
+  std::vector<IndirectSymbolData> &getIndirectSymbols() {
+    return IndirectSymbols;
+  }
+
   MCLOHContainer &getLOHContainer() { return LOHContainer; }
 
   std::vector<DataRegionData> &getDataRegions() { return DataRegions; }

llvm/lib/MC/MCMachOStreamer.cpp

@@ -297,7 +297,7 @@ bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym,
   if (Attribute == MCSA_IndirectSymbol) {
     // Note that we intentionally cannot use the symbol data here; this is
     // important for matching the string table that 'as' generates.
-    getWriter().getIndirectSymbols().push_back(
+    getMCObjectWriter().getIndirectSymbols().push_back(
         {Symbol, getCurrentSectionOnly()});
     return true;
   }

llvm/lib/MC/MCObjectWriter.cpp

@@ -28,6 +28,7 @@ void MCObjectWriter::reset() {
   LinkerOptions.clear();
   LOHContainer.reset();
   DataRegions.clear();
+  IndirectSymbols.clear();
 }
 
 bool MCObjectWriter::isSymbolRefDifferenceFullyResolved(