From f0b21edf5810b29298c4fa4695b2298581617f5a Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Tue, 21 May 2019 17:31:51 +0000 Subject: [PATCH] [Dsymutil] Remove redundant argument (NFC) The dwarf streamer already holds a copy of the link options, so there's no need to pass them as an argument. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361276 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/dsymutil/DwarfLinker.cpp | 6 +++--- tools/dsymutil/DwarfStreamer.cpp | 3 +-- tools/dsymutil/DwarfStreamer.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index ab666270aa1..79e3437a04d 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/tools/dsymutil/DwarfLinker.cpp @@ -626,7 +626,7 @@ unsigned DwarfLinker::shouldKeepVariableDIE(RelocationManager &RelocMgr, MyInfo.InDebugMap = true; return Flags | TF_Keep; } - + Optional LocationIdx = Abbrev->findAttributeIndex(dwarf::DW_AT_location); if (!LocationIdx) @@ -1820,7 +1820,7 @@ void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit, OrigDwarf.getDWARFObj(), OrigDwarf.getDWARFObj().getLineSection(), OrigDwarf.isLittleEndian(), Unit.getOrigUnit().getAddressByteSize()); if (Options.Translator) - return Streamer->translateLineTable(LineExtractor, StmtOffset, Options); + return Streamer->translateLineTable(LineExtractor, StmtOffset); Error Err = LineTable.parse(LineExtractor, &StmtOffset, OrigDwarf, &Unit.getOrigUnit(), DWARFContext::dumpWarning); @@ -2845,7 +2845,7 @@ bool DwarfLinker::link(const DebugMap &Map) { copySwiftInterfaces(ParseableSwiftInterfaces, ArchName, Options)) return error(toString(std::move(E))); } - + return Streamer->finish(Map, Options.Translator); } // namespace dsymutil diff --git a/tools/dsymutil/DwarfStreamer.cpp b/tools/dsymutil/DwarfStreamer.cpp index ccc6a2c852c..f8fe379e604 100644 --- a/tools/dsymutil/DwarfStreamer.cpp +++ b/tools/dsymutil/DwarfStreamer.cpp @@ -584,8 +584,7 @@ void DwarfStreamer::emitLineTableForUnit(MCDwarfLineTableParams Params, /// Copy the debug_line over to the updated binary while unobfuscating the file /// names and directories. -void DwarfStreamer::translateLineTable(DataExtractor Data, uint32_t Offset, - LinkOptions &Options) { +void DwarfStreamer::translateLineTable(DataExtractor Data, uint32_t Offset) { MS->SwitchSection(MC->getObjectFileInfo()->getDwarfLineSection()); StringRef Contents = Data.getData(); diff --git a/tools/dsymutil/DwarfStreamer.h b/tools/dsymutil/DwarfStreamer.h index 0b71d9f49bf..78112408297 100644 --- a/tools/dsymutil/DwarfStreamer.h +++ b/tools/dsymutil/DwarfStreamer.h @@ -107,8 +107,7 @@ public: /// Copy the debug_line over to the updated binary while unobfuscating the /// file names and directories. - void translateLineTable(DataExtractor LineData, uint32_t Offset, - LinkOptions &Options); + void translateLineTable(DataExtractor LineData, uint32_t Offset); /// Copy over the debug sections that are not modified when updating. void copyInvariantDebugSection(const object::ObjectFile &Obj); -- 2.40.0