MCNopsFragment,MCBoundaryAlignFragment: Use parent MCSubtargetInfo

Author: MaskRay

llvm/include/llvm/MC/MCSection.h

@@ -107,8 +107,10 @@ class MCFragment {
   uint32_t VarContentEnd = 0;
   uint32_t VarFixupStart = 0;
 
+protected:
   const MCSubtargetInfo *STI = nullptr;
 
+private:
   // Optional variable-size tail used by various fragment types.
   union Tail {
     struct {
@@ -362,22 +364,19 @@ class MCNopsFragment : public MCFragment {
   /// Source location of the directive that this fragment was created for.
   SMLoc Loc;
 
-  /// When emitting Nops some subtargets have specific nop encodings.
-  const MCSubtargetInfo &STI;
-
 public:
   MCNopsFragment(int64_t NumBytes, int64_t ControlledNopLength, SMLoc L,
                  const MCSubtargetInfo &STI)
       : MCFragment(FT_Nops), Size(NumBytes),
-        ControlledNopLength(ControlledNopLength), Loc(L), STI(STI) {}
+        ControlledNopLength(ControlledNopLength), Loc(L) {
+    this->STI = &STI;
+  }
 
   int64_t getNumBytes() const { return Size; }
   int64_t getControlledNopLength() const { return ControlledNopLength; }
 
   SMLoc getLoc() const { return Loc; }
 
-  const MCSubtargetInfo *getSubtargetInfo() const { return &STI; }
-
   static bool classof(const MCFragment *F) {
     return F->getKind() == MCFragment::FT_Nops;
   }
@@ -490,12 +489,11 @@ class MCBoundaryAlignFragment : public MCFragment {
   /// is not meaningful before that.
   uint64_t Size = 0;
 
-  /// When emitting Nops some subtargets have specific nop encodings.
-  const MCSubtargetInfo &STI;
-
 public:
   MCBoundaryAlignFragment(Align AlignBoundary, const MCSubtargetInfo &STI)
-      : MCFragment(FT_BoundaryAlign), AlignBoundary(AlignBoundary), STI(STI) {}
+      : MCFragment(FT_BoundaryAlign), AlignBoundary(AlignBoundary) {
+    this->STI = &STI;
+  }
 
   uint64_t getSize() const { return Size; }
   void setSize(uint64_t Value) { Size = Value; }
@@ -509,8 +507,6 @@ class MCBoundaryAlignFragment : public MCFragment {
     LastFragment = F;
   }
 
-  const MCSubtargetInfo *getSubtargetInfo() const { return &STI; }
-
   static bool classof(const MCFragment *F) {
     return F->getKind() == MCFragment::FT_BoundaryAlign;
   }