[llvm] r327384 - [dsymutil] Unbreak non-Darwin bots.

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Tue Mar 13 04:32:19 2018
New Revision: 327384

URL: http://llvm.org/viewvc/llvm-project?rev=327384&view=rev
Log:
[dsymutil] Unbreak non-Darwin bots.

BinaryHolder -> BinHolder

Modified:
    llvm/trunk/tools/dsymutil/DwarfLinker.cpp

Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=327384&r1=327383&r2=327384&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Tue Mar 13 04:32:19 2018
@@ -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> 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;
     }