@@ -278,8 +278,7 @@ class DIEStreamer : public DwarfStreamer {
278
278
}
279
279
280
280
public:
281
- DIEStreamer (DIEBuilder *DIEBldr, DWARFRewriter &Rewriter,
282
- GDBIndex &GDBIndexSection,
281
+ DIEStreamer (DIEBuilder *DIEBldr, GDBIndex &GDBIndexSection,
283
282
DWARFLinkerBase::OutputFileType OutFileType,
284
283
raw_pwrite_stream &OutFile,
285
284
DWARFLinkerBase::MessageHandlerTy Warning)
@@ -460,11 +459,11 @@ static std::optional<uint64_t> getAsAddress(const DWARFUnit &DU,
460
459
static std::unique_ptr<DIEStreamer>
461
460
createDIEStreamer (const Triple &TheTriple, raw_pwrite_stream &OutFile,
462
461
StringRef Swift5ReflectionSegmentName, DIEBuilder &DIEBldr,
463
- DWARFRewriter &Rewriter, GDBIndex &GDBIndexSection) {
462
+ GDBIndex &GDBIndexSection) {
464
463
465
464
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,
468
467
[&](const Twine &Warning, StringRef Context, const DWARFDie *) {});
469
468
Error Err = Streamer->init (TheTriple, Swift5ReflectionSegmentName);
470
469
if (Err)
@@ -502,7 +501,7 @@ emitDWOBuilder(const std::string &DWOName, DIEBuilder &DWODIEBuilder,
502
501
auto TheTriple = std::make_unique<Triple>(File->makeTriple ());
503
502
std::unique_ptr<DIEStreamer> Streamer =
504
503
createDIEStreamer (*TheTriple, *ObjOS, " DwoStreamerInitAug2" ,
505
- DWODIEBuilder, Rewriter, GDBIndexSection);
504
+ DWODIEBuilder, GDBIndexSection);
506
505
DWARFRewriter::UnitMetaVectorType TUMetaVector;
507
506
DWARFRewriter::UnitMeta CUMI = {0 , 0 , 0 };
508
507
if (SplitCU.getContext ().getMaxDWOVersion () >= 5 ) {
@@ -733,7 +732,7 @@ void DWARFRewriter::updateDebugInfo() {
733
732
const object::ObjectFile *File = BC.DwCtx ->getDWARFObj ().getFile ();
734
733
auto TheTriple = std::make_unique<Triple>(File->makeTriple ());
735
734
std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer (
736
- *TheTriple, *ObjOS, " TypeStreamer" , DIEBlder, * this , GDBIndexSection);
735
+ *TheTriple, *ObjOS, " TypeStreamer" , DIEBlder, GDBIndexSection);
737
736
CUOffsetMap OffsetMap =
738
737
finalizeTypeSections (DIEBlder, *Streamer, GDBIndexSection);
739
738
@@ -1456,7 +1455,7 @@ CUOffsetMap DWARFRewriter::finalizeTypeSections(DIEBuilder &DIEBlder,
1456
1455
const object::ObjectFile *File = BC.DwCtx ->getDWARFObj ().getFile ();
1457
1456
auto TheTriple = std::make_unique<Triple>(File->makeTriple ());
1458
1457
std::unique_ptr<DIEStreamer> TypeStreamer = createDIEStreamer (
1459
- *TheTriple, *ObjOS, " TypeStreamer" , DIEBlder, * this , GDBIndexSection);
1458
+ *TheTriple, *ObjOS, " TypeStreamer" , DIEBlder, GDBIndexSection);
1460
1459
1461
1460
// generate debug_info and CUMap
1462
1461
CUOffsetMap CUMap;
0 commit comments