Move LOHContainer to MCObjectWriter

Author: rastogishubham

llvm/include/llvm/MC/MCMachObjectWriter.h

@@ -165,9 +165,6 @@ class MachObjectWriter : public MCObjectWriter {
 
   /// @}
 
-  // Used to communicate Linker Optimization Hint information.
-  MCLOHContainer LOHContainer;
-
   VersionInfoType VersionInfo{};
   VersionInfoType TargetVariantVersionInfo{};
 
@@ -219,7 +216,6 @@ class MachObjectWriter : public MCObjectWriter {
     return SectionOrder;
   }
   SectionAddrMap &getSectionAddressMap() { return SectionAddress; }
-  MCLOHContainer &getLOHContainer() { return LOHContainer; }
 
   uint64_t getSectionAddress(const MCSection *Sec) const {
     return SectionAddress.lookup(Sec);

llvm/include/llvm/MC/MCObjectWriter.h

@@ -10,6 +10,7 @@
 #define LLVM_MC_MCOBJECTWRITER_H
 
 #include "llvm/MC/MCDirectives.h"
+#include "llvm/MC/MCLinkerOptimizationHint.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/TargetParser/Triple.h"
 #include <cstdint>
@@ -36,6 +37,9 @@ class MCObjectWriter {
   // The list of linker options for LC_LINKER_OPTION.
   std::vector<std::vector<std::string>> LinkerOptions;
 
+  // Used to communicate Linker Optimization Hint information.
+  MCLOHContainer LOHContainer;
+
   /// List of declared file names
   SmallVector<std::pair<std::string, size_t>, 0> FileNames;
   // XCOFF specific: Optional compiler version.
@@ -68,6 +72,8 @@ class MCObjectWriter {
     return LinkerOptions;
   }
 
+  MCLOHContainer &getLOHContainer() { return LOHContainer; }
+
   /// Perform any late binding of symbols (for example, to assign symbol
   /// indices for use when generating relocations).
   ///

llvm/lib/MC/MCMachOStreamer.cpp

@@ -124,7 +124,7 @@ class MCMachOStreamer : public MCObjectStreamer {
   }
 
   void emitLOHDirective(MCLOHType Kind, const MCLOHArgs &Args) override {
-    getWriter().getLOHContainer().addDirective(Kind, Args);
+    getMCObjectWriter().getLOHContainer().addDirective(Kind, Args);
   }
   void emitCGProfileEntry(const MCSymbolRefExpr *From,
                           const MCSymbolRefExpr *To, uint64_t Count) override {

llvm/lib/MC/MCObjectWriter.cpp

@@ -26,6 +26,7 @@ void MCObjectWriter::reset() {
   SubsectionsViaSymbols = false;
   CGProfile.clear();
   LinkerOptions.clear();
+  LOHContainer.reset();
 }
 
 bool MCObjectWriter::isSymbolRefDifferenceFullyResolved(