diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp index ab666270aa1e..79e3437a04d0 100644 --- a/llvm/tools/dsymutil/DwarfLinker.cpp +++ b/llvm/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/llvm/tools/dsymutil/DwarfStreamer.cpp b/llvm/tools/dsymutil/DwarfStreamer.cpp index ccc6a2c852c9..f8fe379e6041 100644 --- a/llvm/tools/dsymutil/DwarfStreamer.cpp +++ b/llvm/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/llvm/tools/dsymutil/DwarfStreamer.h b/llvm/tools/dsymutil/DwarfStreamer.h index 0b71d9f49bfa..781124082972 100644 --- a/llvm/tools/dsymutil/DwarfStreamer.h +++ b/llvm/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);