Skip to content

Commit 3c8e0b8

Browse files
[BOLT] Clean up DIEStreamer (NFC) (llvm#95028)
DIEStreamer no longer needs Rewriter, so we can remove the constructor parameter and clean up the callers.
1 parent f50656c commit 3c8e0b8

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

bolt/lib/Rewrite/DWARFRewriter.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@ class DIEStreamer : public DwarfStreamer {
278278
}
279279

280280
public:
281-
DIEStreamer(DIEBuilder *DIEBldr, DWARFRewriter &Rewriter,
282-
GDBIndex &GDBIndexSection,
281+
DIEStreamer(DIEBuilder *DIEBldr, GDBIndex &GDBIndexSection,
283282
DWARFLinkerBase::OutputFileType OutFileType,
284283
raw_pwrite_stream &OutFile,
285284
DWARFLinkerBase::MessageHandlerTy Warning)
@@ -460,11 +459,11 @@ static std::optional<uint64_t> getAsAddress(const DWARFUnit &DU,
460459
static std::unique_ptr<DIEStreamer>
461460
createDIEStreamer(const Triple &TheTriple, raw_pwrite_stream &OutFile,
462461
StringRef Swift5ReflectionSegmentName, DIEBuilder &DIEBldr,
463-
DWARFRewriter &Rewriter, GDBIndex &GDBIndexSection) {
462+
GDBIndex &GDBIndexSection) {
464463

465464
std::unique_ptr<DIEStreamer> Streamer = std::make_unique<DIEStreamer>(
466-
&DIEBldr, Rewriter, GDBIndexSection,
467-
DWARFLinkerBase::OutputFileType::Object, OutFile,
465+
&DIEBldr, GDBIndexSection, DWARFLinkerBase::OutputFileType::Object,
466+
OutFile,
468467
[&](const Twine &Warning, StringRef Context, const DWARFDie *) {});
469468
Error Err = Streamer->init(TheTriple, Swift5ReflectionSegmentName);
470469
if (Err)
@@ -502,7 +501,7 @@ emitDWOBuilder(const std::string &DWOName, DIEBuilder &DWODIEBuilder,
502501
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
503502
std::unique_ptr<DIEStreamer> Streamer =
504503
createDIEStreamer(*TheTriple, *ObjOS, "DwoStreamerInitAug2",
505-
DWODIEBuilder, Rewriter, GDBIndexSection);
504+
DWODIEBuilder, GDBIndexSection);
506505
DWARFRewriter::UnitMetaVectorType TUMetaVector;
507506
DWARFRewriter::UnitMeta CUMI = {0, 0, 0};
508507
if (SplitCU.getContext().getMaxDWOVersion() >= 5) {
@@ -733,7 +732,7 @@ void DWARFRewriter::updateDebugInfo() {
733732
const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile();
734733
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
735734
std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer(
736-
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this, GDBIndexSection);
735+
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection);
737736
CUOffsetMap OffsetMap =
738737
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
739738

@@ -1456,7 +1455,7 @@ CUOffsetMap DWARFRewriter::finalizeTypeSections(DIEBuilder &DIEBlder,
14561455
const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile();
14571456
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
14581457
std::unique_ptr<DIEStreamer> TypeStreamer = createDIEStreamer(
1459-
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this, GDBIndexSection);
1458+
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection);
14601459

14611460
// generate debug_info and CUMap
14621461
CUOffsetMap CUMap;

0 commit comments

Comments
 (0)