diff options
Diffstat (limited to 'contrib/llvm-project/llvm/tools/llvm-dwarfutil')
| -rw-r--r-- | contrib/llvm-project/llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp b/contrib/llvm-project/llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp index 02a94596ec76..d6504992b56e 100644 --- a/contrib/llvm-project/llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp +++ b/contrib/llvm-project/llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp @@ -9,9 +9,9 @@ #include "DebugInfoLinker.h" #include "Error.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/DWARFLinker/DWARFLinker.h" -#include "llvm/DWARFLinker/DWARFStreamer.h" -#include "llvm/DWARFLinkerParallel/DWARFLinker.h" +#include "llvm/DWARFLinker/Classic/DWARFLinker.h" +#include "llvm/DWARFLinker/Classic/DWARFStreamer.h" +#include "llvm/DWARFLinker/Parallel/DWARFLinker.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h" #include "llvm/DebugInfo/DWARF/DWARFExpression.h" #include "llvm/Object/ObjectFile.h" @@ -19,6 +19,8 @@ #include <vector> namespace llvm { +using namespace dwarf_linker; + namespace dwarfutil { // ObjFileAddressMap allows to check whether specified DIE referencing @@ -37,8 +39,7 @@ namespace dwarfutil { // exec: [LowPC, HighPC] is not inside address ranges of .text sections // // universal: maxpc and bfd -template <typename AddressMapBase> -class ObjFileAddressMap : public AddressMapBase { +class ObjFileAddressMap : public AddressesMap { public: ObjFileAddressMap(DWARFContext &Context, const Options &Options, object::ObjectFile &ObjFile) @@ -298,7 +299,7 @@ static std::string getMessageForDeletedAcceleratorTables( return Message; } -template <typename Linker, typename OutDwarfFile, typename AddressMapBase> +template <typename Linker> Error linkDebugInfoImpl(object::ObjectFile &File, const Options &Options, raw_pwrite_stream &OutStream) { std::mutex ErrorHandlerMutex; @@ -345,7 +346,7 @@ Error linkDebugInfoImpl(object::ObjectFile &File, const Options &Options, DebugInfoLinker->setVerbosity(Options.Verbose); DebugInfoLinker->setUpdateIndexTablesOnly(!Options.DoGarbageCollection); - std::vector<std::unique_ptr<OutDwarfFile>> ObjectsForLinking(1); + std::vector<std::unique_ptr<DWARFFile>> ObjectsForLinking(1); // Add object files to the DWARFLinker. std::unique_ptr<DWARFContext> Context = DWARFContext::create( @@ -360,11 +361,10 @@ Error linkDebugInfoImpl(object::ObjectFile &File, const Options &Options, ReportWarn(Info.message(), "", nullptr); }); }); - std::unique_ptr<ObjFileAddressMap<AddressMapBase>> AddressesMap( - std::make_unique<ObjFileAddressMap<AddressMapBase>>(*Context, Options, - File)); + std::unique_ptr<ObjFileAddressMap> AddressesMap( + std::make_unique<ObjFileAddressMap>(*Context, Options, File)); - ObjectsForLinking[0] = std::make_unique<OutDwarfFile>( + ObjectsForLinking[0] = std::make_unique<DWARFFile>( File.getFileName(), std::move(Context), std::move(AddressesMap)); uint16_t MaxDWARFVersion = 0; @@ -400,7 +400,7 @@ Error linkDebugInfoImpl(object::ObjectFile &File, const Options &Options, for (typename Linker::AccelTableKind Table : AccelTables) DebugInfoLinker->addAccelTableKind(Table); - for (std::unique_ptr<OutDwarfFile> &CurFile : ObjectsForLinking) { + for (std::unique_ptr<DWARFFile> &CurFile : ObjectsForLinking) { SmallVector<StringRef> AccelTableNamesToReplace; SmallVector<StringRef> AccelTableNamesToDelete; @@ -452,13 +452,9 @@ Error linkDebugInfoImpl(object::ObjectFile &File, const Options &Options, Error linkDebugInfo(object::ObjectFile &File, const Options &Options, raw_pwrite_stream &OutStream) { if (Options.UseLLVMDWARFLinker) - return linkDebugInfoImpl<dwarflinker_parallel::DWARFLinker, - dwarflinker_parallel::DWARFFile, - dwarflinker_parallel::AddressesMap>(File, Options, - OutStream); + return linkDebugInfoImpl<parallel::DWARFLinker>(File, Options, OutStream); else - return linkDebugInfoImpl<DWARFLinker, DWARFFile, AddressesMap>( - File, Options, OutStream); + return linkDebugInfoImpl<classic::DWARFLinker>(File, Options, OutStream); } } // end of namespace dwarfutil |