diff options
author | Kazu Hirata <kazu@google.com> | 2024-06-10 14:51:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-10 14:51:48 -0700 |
commit | 3c8e0b8874fa3f8c8f84aa7261e905a57ba3d4a8 (patch) | |
tree | 8d6acbb9d95e721b304df04798d01010bc78fba9 | |
parent | f50656c50938781fdfdabe05c9225783ce7e409d (diff) | |
download | llvm-3c8e0b8874fa3f8c8f84aa7261e905a57ba3d4a8.zip llvm-3c8e0b8874fa3f8c8f84aa7261e905a57ba3d4a8.tar.gz llvm-3c8e0b8874fa3f8c8f84aa7261e905a57ba3d4a8.tar.bz2 |
[BOLT] Clean up DIEStreamer (NFC) (#95028)
DIEStreamer no longer needs Rewriter, so we can remove the constructor
parameter and clean up the callers.
-rw-r--r-- | bolt/lib/Rewrite/DWARFRewriter.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp index bf0e2bd..e1b3762 100644 --- a/bolt/lib/Rewrite/DWARFRewriter.cpp +++ b/bolt/lib/Rewrite/DWARFRewriter.cpp @@ -278,8 +278,7 @@ private: } public: - DIEStreamer(DIEBuilder *DIEBldr, DWARFRewriter &Rewriter, - GDBIndex &GDBIndexSection, + DIEStreamer(DIEBuilder *DIEBldr, GDBIndex &GDBIndexSection, DWARFLinkerBase::OutputFileType OutFileType, raw_pwrite_stream &OutFile, DWARFLinkerBase::MessageHandlerTy Warning) @@ -460,11 +459,11 @@ static std::optional<uint64_t> getAsAddress(const DWARFUnit &DU, static std::unique_ptr<DIEStreamer> createDIEStreamer(const Triple &TheTriple, raw_pwrite_stream &OutFile, StringRef Swift5ReflectionSegmentName, DIEBuilder &DIEBldr, - DWARFRewriter &Rewriter, GDBIndex &GDBIndexSection) { + GDBIndex &GDBIndexSection) { std::unique_ptr<DIEStreamer> Streamer = std::make_unique<DIEStreamer>( - &DIEBldr, Rewriter, GDBIndexSection, - DWARFLinkerBase::OutputFileType::Object, OutFile, + &DIEBldr, GDBIndexSection, DWARFLinkerBase::OutputFileType::Object, + OutFile, [&](const Twine &Warning, StringRef Context, const DWARFDie *) {}); Error Err = Streamer->init(TheTriple, Swift5ReflectionSegmentName); if (Err) @@ -502,7 +501,7 @@ emitDWOBuilder(const std::string &DWOName, DIEBuilder &DWODIEBuilder, auto TheTriple = std::make_unique<Triple>(File->makeTriple()); std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer(*TheTriple, *ObjOS, "DwoStreamerInitAug2", - DWODIEBuilder, Rewriter, GDBIndexSection); + DWODIEBuilder, GDBIndexSection); DWARFRewriter::UnitMetaVectorType TUMetaVector; DWARFRewriter::UnitMeta CUMI = {0, 0, 0}; if (SplitCU.getContext().getMaxDWOVersion() >= 5) { @@ -733,7 +732,7 @@ void DWARFRewriter::updateDebugInfo() { const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile(); auto TheTriple = std::make_unique<Triple>(File->makeTriple()); std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer( - *TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this, GDBIndexSection); + *TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection); CUOffsetMap OffsetMap = finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection); @@ -1456,7 +1455,7 @@ CUOffsetMap DWARFRewriter::finalizeTypeSections(DIEBuilder &DIEBlder, const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile(); auto TheTriple = std::make_unique<Triple>(File->makeTriple()); std::unique_ptr<DIEStreamer> TypeStreamer = createDIEStreamer( - *TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this, GDBIndexSection); + *TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection); // generate debug_info and CUMap CUOffsetMap CUMap; |