[MC] Decrease direct access to getContents()

MaskRay · MaskRay · commit 3fa5b52714b3 · 2024-12-21T17:14:26.000-08:00
to make it easier to store fragment contents out-of-line. Loosely based
on Alexis Engelke's prototype.
diff --git a/llvm/include/llvm/MC/MCFragment.h b/llvm/include/llvm/MC/MCFragment.h
@@ -197,6 +197,10 @@ class MCEncodedFragmentWithFixups : public MCEncodedFragment {
   SmallVectorImpl<char> &getContents() { return Contents; }
   const SmallVectorImpl<char> &getContents() const { return Contents; }
 
+  void appendContents(ArrayRef<char> C) { Contents.append(C.begin(), C.end()); }
+  void appendContents(size_t Num, char Elt) { Contents.append(Num, Elt); }
+  void setContents(ArrayRef<char> C) { Contents.assign(C.begin(), C.end()); }
+
   SmallVectorImpl<MCFixup> &getFixups() { return Fixups; }
   const SmallVectorImpl<MCFixup> &getFixups() const { return Fixups; }
 
diff --git a/llvm/lib/MC/MCCodeView.cpp b/llvm/lib/MC/MCCodeView.cpp
@@ -137,7 +137,7 @@ MCDataFragment *CodeViewContext::getStringTableFragment() {
   if (!StrTabFragment) {
     StrTabFragment = MCCtx->allocFragment<MCDataFragment>();
     // Start a new string table out with a null byte.
-    StrTabFragment->getContents().push_back('\0');
+    StrTabFragment->appendContents(1, '\0');
   }
   return StrTabFragment;
 }
@@ -151,7 +151,8 @@ std::pair<StringRef, unsigned> CodeViewContext::addToStringTable(StringRef S) {
       std::make_pair(Insertion.first->first(), Insertion.first->second);
   if (Insertion.second) {
     // The string map key is always null terminated.
-    Contents.append(Ret.first.begin(), Ret.first.end() + 1);
+    StrTabFragment->appendContents(
+        ArrayRef(Ret.first.begin(), Ret.first.end() + 1));
   }
   return Ret;
 }
diff --git a/llvm/lib/MC/MCMachOStreamer.cpp b/llvm/lib/MC/MCMachOStreamer.cpp
@@ -456,7 +456,7 @@ void MCMachOStreamer::emitInstToData(const MCInst &Inst,
     DF->getFixups().push_back(Fixup);
   }
   DF->setHasInstructions(STI);
-  DF->getContents().append(Code.begin(), Code.end());
+  DF->appendContents(Code);
 }
 
 void MCMachOStreamer::finishImpl() {
@@ -523,8 +523,7 @@ void MCMachOStreamer::finalizeCGProfile() {
   size_t SectionBytes =
       W.getCGProfile().size() * (2 * sizeof(uint32_t) + sizeof(uint64_t));
   cast<MCDataFragment>(*CGProfileSection->begin())
-      .getContents()
-      .resize(SectionBytes);
+      .appendContents(SectionBytes, 0);
 }
 
 MCStreamer *llvm::createMachOStreamer(MCContext &Context,
@@ -559,5 +558,5 @@ void MCMachOStreamer::createAddrSigSection() {
   // (instead of emitting a zero-sized section) so these relocations are
   // technically valid, even though we don't expect these relocations to
   // actually be applied by the linker.
-  Frag->getContents().resize(8);
+  Frag->appendContents(8, 0);
 }
diff --git a/llvm/lib/MC/MCObjectStreamer.cpp b/llvm/lib/MC/MCObjectStreamer.cpp
@@ -202,7 +202,7 @@ void MCObjectStreamer::emitValueImpl(const MCExpr *Value, unsigned Size,
   DF->getFixups().push_back(
       MCFixup::create(DF->getContents().size(), Value,
                       MCFixup::getKindForSize(Size, false), Loc));
-  DF->getContents().resize(DF->getContents().size() + Size, 0);
+  DF->appendContents(Size, 0);
 }
 
 MCSymbol *MCObjectStreamer::emitCFILabel() {
@@ -552,7 +552,7 @@ void MCObjectStreamer::emitCVFileChecksumOffsetDirective(unsigned FileNo) {
 void MCObjectStreamer::emitBytes(StringRef Data) {
   MCDwarfLineEntry::make(this, getCurrentSectionOnly());
   MCDataFragment *DF = getOrCreateDataFragment();
-  DF->getContents().append(Data.begin(), Data.end());
+  DF->appendContents(ArrayRef(Data.data(), Data.size()));
 }
 
 void MCObjectStreamer::emitValueToAlignment(Align Alignment, int64_t Value,
@@ -586,47 +586,47 @@ void MCObjectStreamer::emitDTPRel32Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(MCFixup::create(DF->getContents().size(),
                                             Value, FK_DTPRel_4));
-  DF->getContents().resize(DF->getContents().size() + 4, 0);
+  DF->appendContents(4, 0);
 }
 
 // Associate DTPRel64 fixup with data and resize data area
 void MCObjectStreamer::emitDTPRel64Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(MCFixup::create(DF->getContents().size(),
                                             Value, FK_DTPRel_8));
-  DF->getContents().resize(DF->getContents().size() + 8, 0);
+  DF->appendContents(8, 0);
 }
 
 // Associate TPRel32 fixup with data and resize data area
 void MCObjectStreamer::emitTPRel32Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(MCFixup::create(DF->getContents().size(),
                                             Value, FK_TPRel_4));
-  DF->getContents().resize(DF->getContents().size() + 4, 0);
+  DF->appendContents(4, 0);
 }
 
 // Associate TPRel64 fixup with data and resize data area
 void MCObjectStreamer::emitTPRel64Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(MCFixup::create(DF->getContents().size(),
                                             Value, FK_TPRel_8));
-  DF->getContents().resize(DF->getContents().size() + 8, 0);
+  DF->appendContents(8, 0);
 }
 
 // Associate GPRel32 fixup with data and resize data area
 void MCObjectStreamer::emitGPRel32Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(
       MCFixup::create(DF->getContents().size(), Value, FK_GPRel_4));
-  DF->getContents().resize(DF->getContents().size() + 4, 0);
+  DF->appendContents(4, 0);
 }
 
 // Associate GPRel64 fixup with data and resize data area
 void MCObjectStreamer::emitGPRel64Value(const MCExpr *Value) {
   MCDataFragment *DF = getOrCreateDataFragment();
   DF->getFixups().push_back(
       MCFixup::create(DF->getContents().size(), Value, FK_GPRel_4));
-  DF->getContents().resize(DF->getContents().size() + 8, 0);
+  DF->appendContents(8, 0);
 }
 
 static std::optional<std::pair<bool, std::string>>
diff --git a/llvm/lib/MC/MCSPIRVStreamer.cpp b/llvm/lib/MC/MCSPIRVStreamer.cpp
@@ -28,7 +28,7 @@ void MCSPIRVStreamer::emitInstToData(const MCInst &Inst,
   MCDataFragment *DF = getOrCreateDataFragment();
 
   DF->setHasInstructions(STI);
-  DF->getContents().append(Code.begin(), Code.end());
+  DF->appendContents(Code);
 }
 
 MCStreamer *llvm::createSPIRVStreamer(MCContext &Context,
diff --git a/llvm/lib/MC/MCWasmStreamer.cpp b/llvm/lib/MC/MCWasmStreamer.cpp
@@ -196,7 +196,7 @@ void MCWasmStreamer::emitInstToData(const MCInst &Inst,
     DF->getFixups().push_back(Fixups[I]);
   }
   DF->setHasInstructions(STI);
-  DF->getContents().append(Code.begin(), Code.end());
+  DF->appendContents(Code);
 }
 
 void MCWasmStreamer::finishImpl() {
diff --git a/llvm/lib/MC/MCWinCOFFStreamer.cpp b/llvm/lib/MC/MCWinCOFFStreamer.cpp
@@ -71,7 +71,7 @@ void MCWinCOFFStreamer::emitInstToData(const MCInst &Inst,
     DF->getFixups().push_back(Fixups[i]);
   }
   DF->setHasInstructions(STI);
-  DF->getContents().append(Code.begin(), Code.end());
+  DF->appendContents(Code);
 }
 
 void MCWinCOFFStreamer::initSections(bool NoExecStack,
@@ -239,7 +239,7 @@ void MCWinCOFFStreamer::emitCOFFSectionIndex(const MCSymbol *Symbol) {
   const MCSymbolRefExpr *SRE = MCSymbolRefExpr::create(Symbol, getContext());
   MCFixup Fixup = MCFixup::create(DF->getContents().size(), SRE, FK_SecRel_2);
   DF->getFixups().push_back(Fixup);
-  DF->getContents().resize(DF->getContents().size() + 2, 0);
+  DF->appendContents(2, 0);
 }
 
 void MCWinCOFFStreamer::emitCOFFSecRel32(const MCSymbol *Symbol,
@@ -257,7 +257,7 @@ void MCWinCOFFStreamer::emitCOFFSecRel32(const MCSymbol *Symbol,
   // Record the relocation.
   DF->getFixups().push_back(Fixup);
   // Emit 4 bytes (zeros) to the object file.
-  DF->getContents().resize(DF->getContents().size() + 4, 0);
+  DF->appendContents(4, 0);
 }
 
 void MCWinCOFFStreamer::emitCOFFImgRel32(const MCSymbol *Symbol,
@@ -276,7 +276,7 @@ void MCWinCOFFStreamer::emitCOFFImgRel32(const MCSymbol *Symbol,
   // Record the relocation.
   DF->getFixups().push_back(Fixup);
   // Emit 4 bytes (zeros) to the object file.
-  DF->getContents().resize(DF->getContents().size() + 4, 0);
+  DF->appendContents(4, 0);
 }
 
 void MCWinCOFFStreamer::emitCommonSymbol(MCSymbol *S, uint64_t Size,
diff --git a/llvm/lib/MC/MCXCOFFStreamer.cpp b/llvm/lib/MC/MCXCOFFStreamer.cpp
@@ -161,7 +161,7 @@ void MCXCOFFStreamer::emitInstToData(const MCInst &Inst,
   }
 
   DF->setHasInstructions(STI);
-  DF->getContents().append(Code.begin(), Code.end());
+  DF->appendContents(Code);
 }
 
 void MCXCOFFStreamer::emitXCOFFLocalCommonSymbol(MCSymbol *LabelSym,
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonAsmBackend.cpp
@@ -54,7 +54,7 @@ class HexagonAsmBackend : public MCAsmBackend {
 
     // Update the fragment.
     RF.setInst(HMB);
-    RF.getContents() = Code;
+    RF.setContents(Code);
     RF.getFixups() = Fixups;
   }
 
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -811,7 +811,7 @@ bool X86AsmBackend::padInstructionViaPrefix(MCRelaxableFragment &RF,
   SmallString<256> Code;
   Code.append(PrefixBytesToAdd, Prefix);
   Code.append(RF.getContents().begin(), RF.getContents().end());
-  RF.getContents() = Code;
+  RF.setContents(Code);
 
   // Adjust the fixups for the change in offsets
   for (auto &F : RF.getFixups()) {
@@ -843,7 +843,7 @@ bool X86AsmBackend::padInstructionViaRelaxation(MCRelaxableFragment &RF,
   if (Delta > RemainingSize)
     return false;
   RF.setInst(Relaxed);
-  RF.getContents() = Code;
+  RF.setContents(Code);
   RF.getFixups() = Fixups;
   RemainingSize -= Delta;
   return true;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ MCDataFragment *CodeViewContext::getStringTableFragment() {`
`137`	`137`	`if (!StrTabFragment) {`
`138`	`138`	`StrTabFragment = MCCtx->allocFragment<MCDataFragment>();`
`139`	`139`	`// Start a new string table out with a null byte.`
`140`		`- StrTabFragment->getContents().push_back('\0');`
	`140`	`+ StrTabFragment->appendContents(1, '\0');`
`141`	`141`	`}`
`142`	`142`	`return StrTabFragment;`
`143`	`143`	`}`
`@@ -151,7 +151,8 @@ std::pair<StringRef, unsigned> CodeViewContext::addToStringTable(StringRef S) {`
`151`	`151`	`std::make_pair(Insertion.first->first(), Insertion.first->second);`
`152`	`152`	`if (Insertion.second) {`
`153`	`153`	`// The string map key is always null terminated.`
`154`		`- Contents.append(Ret.first.begin(), Ret.first.end() + 1);`
	`154`	`+ StrTabFragment->appendContents(`
	`155`	`+ ArrayRef(Ret.first.begin(), Ret.first.end() + 1));`
`155`	`156`	`}`
`156`	`157`	`return Ret;`
`157`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ void MCMachOStreamer::emitInstToData(const MCInst &Inst,`
`456`	`456`	`DF->getFixups().push_back(Fixup);`
`457`	`457`	`}`
`458`	`458`	`DF->setHasInstructions(STI);`
`459`		`- DF->getContents().append(Code.begin(), Code.end());`
	`459`	`+ DF->appendContents(Code);`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`void MCMachOStreamer::finishImpl() {`
`@@ -523,8 +523,7 @@ void MCMachOStreamer::finalizeCGProfile() {`
`523`	`523`	`size_t SectionBytes =`
`524`	`524`	`W.getCGProfile().size() * (2 * sizeof(uint32_t) + sizeof(uint64_t));`
`525`	`525`	`cast<MCDataFragment>(*CGProfileSection->begin())`
`526`		`- .getContents()`
`527`		`- .resize(SectionBytes);`
	`526`	`+ .appendContents(SectionBytes, 0);`
`528`	`527`	`}`
`529`	`528`
`530`	`529`	`MCStreamer *llvm::createMachOStreamer(MCContext &Context,`
`@@ -559,5 +558,5 @@ void MCMachOStreamer::createAddrSigSection() {`
`559`	`558`	`// (instead of emitting a zero-sized section) so these relocations are`
`560`	`559`	`// technically valid, even though we don't expect these relocations to`
`561`	`560`	`// actually be applied by the linker.`
`562`		`- Frag->getContents().resize(8);`
	`561`	`+ Frag->appendContents(8, 0);`
`563`	`562`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void MCSPIRVStreamer::emitInstToData(const MCInst &Inst,`
`28`	`28`	`MCDataFragment *DF = getOrCreateDataFragment();`
`29`	`29`
`30`	`30`	`DF->setHasInstructions(STI);`
`31`		`- DF->getContents().append(Code.begin(), Code.end());`
	`31`	`+ DF->appendContents(Code);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`MCStreamer *llvm::createSPIRVStreamer(MCContext &Context,`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ void MCWasmStreamer::emitInstToData(const MCInst &Inst,`
`196`	`196`	`DF->getFixups().push_back(Fixups[I]);`
`197`	`197`	`}`
`198`	`198`	`DF->setHasInstructions(STI);`
`199`		`- DF->getContents().append(Code.begin(), Code.end());`
	`199`	`+ DF->appendContents(Code);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`void MCWasmStreamer::finishImpl() {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void MCWinCOFFStreamer::emitInstToData(const MCInst &Inst,`
`71`	`71`	`DF->getFixups().push_back(Fixups[i]);`
`72`	`72`	`}`
`73`	`73`	`DF->setHasInstructions(STI);`
`74`		`- DF->getContents().append(Code.begin(), Code.end());`
	`74`	`+ DF->appendContents(Code);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`void MCWinCOFFStreamer::initSections(bool NoExecStack,`
`@@ -239,7 +239,7 @@ void MCWinCOFFStreamer::emitCOFFSectionIndex(const MCSymbol *Symbol) {`
`239`	`239`	`const MCSymbolRefExpr *SRE = MCSymbolRefExpr::create(Symbol, getContext());`
`240`	`240`	`MCFixup Fixup = MCFixup::create(DF->getContents().size(), SRE, FK_SecRel_2);`
`241`	`241`	`DF->getFixups().push_back(Fixup);`
`242`		`- DF->getContents().resize(DF->getContents().size() + 2, 0);`
	`242`	`+ DF->appendContents(2, 0);`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`void MCWinCOFFStreamer::emitCOFFSecRel32(const MCSymbol *Symbol,`
`@@ -257,7 +257,7 @@ void MCWinCOFFStreamer::emitCOFFSecRel32(const MCSymbol *Symbol,`
`257`	`257`	`// Record the relocation.`
`258`	`258`	`DF->getFixups().push_back(Fixup);`
`259`	`259`	`// Emit 4 bytes (zeros) to the object file.`
`260`		`- DF->getContents().resize(DF->getContents().size() + 4, 0);`
	`260`	`+ DF->appendContents(4, 0);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`void MCWinCOFFStreamer::emitCOFFImgRel32(const MCSymbol *Symbol,`
`@@ -276,7 +276,7 @@ void MCWinCOFFStreamer::emitCOFFImgRel32(const MCSymbol *Symbol,`
`276`	`276`	`// Record the relocation.`
`277`	`277`	`DF->getFixups().push_back(Fixup);`
`278`	`278`	`// Emit 4 bytes (zeros) to the object file.`
`279`		`- DF->getContents().resize(DF->getContents().size() + 4, 0);`
	`279`	`+ DF->appendContents(4, 0);`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`void MCWinCOFFStreamer::emitCommonSymbol(MCSymbol *S, uint64_t Size,`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ void MCXCOFFStreamer::emitInstToData(const MCInst &Inst,`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`DF->setHasInstructions(STI);`
`164`		`- DF->getContents().append(Code.begin(), Code.end());`
	`164`	`+ DF->appendContents(Code);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`void MCXCOFFStreamer::emitXCOFFLocalCommonSymbol(MCSymbol *LabelSym,`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class HexagonAsmBackend : public MCAsmBackend {`
`54`	`54`
`55`	`55`	`// Update the fragment.`
`56`	`56`	`RF.setInst(HMB);`
`57`		`- RF.getContents() = Code;`
	`57`	`+ RF.setContents(Code);`
`58`	`58`	`RF.getFixups() = Fixups;`
`59`	`59`	`}`
`60`	`60`