Move DataRegions to MCObjectWriter

Author: rastogishubham

llvm/include/llvm/MC/MCMachObjectWriter.h

@@ -86,12 +86,6 @@ class MCMachObjectTargetWriter : public MCObjectTargetWriter {
 
 class MachObjectWriter : public MCObjectWriter {
 public:
-  struct DataRegionData {
-    MachO::DataRegionType Kind;
-    MCSymbol *Start;
-    MCSymbol *End;
-  };
-
   // A Major version of 0 indicates that no version information was supplied
   // and so the corresponding load command should not be emitted.
   using VersionInfoType = struct {
@@ -146,8 +140,6 @@ class MachObjectWriter : public MCObjectWriter {
   std::vector<IndirectSymbolData> IndirectSymbols;
   DenseMap<const MCSection *, unsigned> IndirectSymBase;
 
-  std::vector<DataRegionData> DataRegions;
-
   SectionAddrMap SectionAddress;
 
   // List of sections in layout order. Virtual sections are after non-virtual
@@ -211,7 +203,6 @@ class MachObjectWriter : public MCObjectWriter {
   std::vector<IndirectSymbolData> &getIndirectSymbols() {
     return IndirectSymbols;
   }
-  std::vector<DataRegionData> &getDataRegions() { return DataRegions; }
   const llvm::SmallVectorImpl<MCSection *> &getSectionOrder() const {
     return SectionOrder;
   }

llvm/include/llvm/MC/MCObjectWriter.h

@@ -33,7 +33,16 @@ class MCValue;
 /// MCAssembler instance, which contains all the symbol and section data which
 /// should be emitted as part of writeObject().
 class MCObjectWriter {
+public:
+  struct DataRegionData {
+    unsigned Kind;
+    MCSymbol *Start;
+    MCSymbol *End;
+  };
+
 protected:
+  std::vector<DataRegionData> DataRegions;
+
   // The list of linker options for LC_LINKER_OPTION.
   std::vector<std::vector<std::string>> LinkerOptions;
 
@@ -74,6 +83,8 @@ class MCObjectWriter {
 
   MCLOHContainer &getLOHContainer() { return LOHContainer; }
 
+  std::vector<DataRegionData> &getDataRegions() { return DataRegions; }
+
   /// Perform any late binding of symbols (for example, to assign symbol
   /// indices for use when generating relocations).
   ///

llvm/lib/MC/MCMachOStreamer.cpp

@@ -203,11 +203,11 @@ void MCMachOStreamer::emitDataRegion(MachO::DataRegionType Kind) {
   MCSymbol *Start = getContext().createTempSymbol();
   emitLabel(Start);
   // Record the region for the object writer to use.
-  getWriter().getDataRegions().push_back({Kind, Start, nullptr});
+  getMCObjectWriter().getDataRegions().push_back({Kind, Start, nullptr});
 }
 
 void MCMachOStreamer::emitDataRegionEnd() {
-  auto &Regions = getWriter().getDataRegions();
+  auto &Regions = getMCObjectWriter().getDataRegions();
   assert(!Regions.empty() && "Mismatched .end_data_region!");
   auto &Data = Regions.back();
   assert(!Data.End && "Mismatched .end_data_region!");

llvm/lib/MC/MCObjectWriter.cpp

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

llvm/lib/MC/MachObjectWriter.cpp

@@ -49,14 +49,12 @@ void MachObjectWriter::reset() {
   Relocations.clear();
   IndirectSymBase.clear();
   IndirectSymbols.clear();
-  DataRegions.clear();
   SectionAddress.clear();
   SectionOrder.clear();
   StringTable.clear();
   LocalSymbolData.clear();
   ExternalSymbolData.clear();
   UndefinedSymbolData.clear();
-  LOHContainer.reset();
   VersionInfo.Major = 0;
   VersionInfo.SDKVersion = VersionTuple();
   TargetVariantVersionInfo.Major = 0;
@@ -1096,10 +1094,11 @@ void MachObjectWriter::writeDataInCodeRegion(MCAssembler &Asm) {
     else
       report_fatal_error("Data region not terminated");
 
-    LLVM_DEBUG(dbgs() << "data in code region-- kind: " << Data.Kind
-                      << "  start: " << Start << "(" << Data.Start->getName()
-                      << ")" << "  end: " << End << "(" << Data.End->getName()
-                      << ")" << "  size: " << End - Start << "\n");
+    LLVM_DEBUG(dbgs() << "data in code region-- kind: "
+                      << (MachO::DataRegionType)Data.Kind << "  start: "
+                      << Start << "(" << Data.Start->getName() << ")"
+                      << "  end: " << End << "(" << Data.End->getName() << ")"
+                      << "  size: " << End - Start << "\n");
     W.write<uint32_t>(Start);
     W.write<uint16_t>(End - Start);
     W.write<uint16_t>(Data.Kind);