From 8e6adf581bcb8452e9508e7d4d21b2579839e1d3 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Tue, 13 Mar 2018 11:32:19 +0000 Subject: [PATCH] [dsymutil] Unbreak non-Darwin bots. BinaryHolder -> BinHolder llvm-svn: 327384 --- llvm/tools/dsymutil/DwarfLinker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp index cfab4af..6c46937 100644 --- a/llvm/tools/dsymutil/DwarfLinker.cpp +++ b/llvm/tools/dsymutil/DwarfLinker.cpp @@ -1554,7 +1554,7 @@ private: /// Keeps track of data associated with one object during linking. struct LinkContext { DebugMapObject &DMO; - BinaryHolder BinaryHolder; + BinaryHolder BinHolder; const object::ObjectFile *ObjectFile; RelocationManager RelocMgr; std::unique_ptr DwarfContext; @@ -1563,8 +1563,8 @@ private: LinkContext(const DebugMap &Map, DwarfLinker &Linker, DebugMapObject &DMO, bool Verbose = false) - : DMO(DMO), BinaryHolder(Verbose), RelocMgr(Linker) { - auto ErrOrObj = Linker.loadObject(BinaryHolder, DMO, Map); + : DMO(DMO), BinHolder(Verbose), RelocMgr(Linker) { + auto ErrOrObj = Linker.loadObject(BinHolder, DMO, Map); ObjectFile = ErrOrObj ? &*ErrOrObj : nullptr; DwarfContext = ObjectFile ? DWARFContext::create(*ObjectFile) : nullptr; } -- 2.7.4