From 8eeece38efaf0ef487ef43964a5884aa74a25286 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Fri, 29 Jun 2018 17:11:34 +0000
Subject: [PATCH] [dsymutil] Rename conflicting declaration

Using MemoryBuffer as member name clashed with the llvm::MemoryBuffer
class.

llvm-svn: 335995
---
 llvm/tools/dsymutil/BinaryHolder.cpp | 16 ++++++++--------
 llvm/tools/dsymutil/BinaryHolder.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/llvm/tools/dsymutil/BinaryHolder.cpp b/llvm/tools/dsymutil/BinaryHolder.cpp
index 72a4e86..e78871c 100644
--- a/llvm/tools/dsymutil/BinaryHolder.cpp
+++ b/llvm/tools/dsymutil/BinaryHolder.cpp
@@ -51,7 +51,7 @@ Error BinaryHolder::ArchiveEntry::load(StringRef Filename,
   if (auto Err = ErrOrBuff.getError())
     return errorCodeToError(Err);
 
-  MemoryBuffer = std::move(*ErrOrBuff);
+  MemBuffer = std::move(*ErrOrBuff);
 
   if (Verbose)
     WithColor::note() << "loaded archive '" << ArchiveFilename << "'\n";
@@ -61,15 +61,15 @@ Error BinaryHolder::ArchiveEntry::load(StringRef Filename,
   std::vector<MemoryBufferRef> ArchiveBuffers;
 
   auto ErrOrFat =
-      object::MachOUniversalBinary::create(MemoryBuffer->getMemBufferRef());
+      object::MachOUniversalBinary::create(MemBuffer->getMemBufferRef());
   if (!ErrOrFat) {
     consumeError(ErrOrFat.takeError());
-    ArchiveBuffers.push_back(MemoryBuffer->getMemBufferRef());
+    ArchiveBuffers.push_back(MemBuffer->getMemBufferRef());
   } else {
     FatBinary = std::move(*ErrOrFat);
     FatBinaryName = ArchiveFilename;
     ArchiveBuffers =
-        getMachOFatMemoryBuffers(FatBinaryName, *MemoryBuffer, *FatBinary);
+        getMachOFatMemoryBuffers(FatBinaryName, *MemBuffer, *FatBinary);
   }
 
   // Finally, try to load the archives.
@@ -90,7 +90,7 @@ Error BinaryHolder::ObjectEntry::load(StringRef Filename, bool Verbose) {
   if (auto Err = ErrOrBuff.getError())
     return errorCodeToError(Err);
 
-  MemoryBuffer = std::move(*ErrOrBuff);
+  MemBuffer = std::move(*ErrOrBuff);
 
   if (Verbose)
     WithColor::note() << "loaded object.\n";
@@ -100,15 +100,15 @@ Error BinaryHolder::ObjectEntry::load(StringRef Filename, bool Verbose) {
   std::vector<MemoryBufferRef> ObjectBuffers;
 
   auto ErrOrFat =
-      object::MachOUniversalBinary::create(MemoryBuffer->getMemBufferRef());
+      object::MachOUniversalBinary::create(MemBuffer->getMemBufferRef());
   if (!ErrOrFat) {
     consumeError(ErrOrFat.takeError());
-    ObjectBuffers.push_back(MemoryBuffer->getMemBufferRef());
+    ObjectBuffers.push_back(MemBuffer->getMemBufferRef());
   } else {
     FatBinary = std::move(*ErrOrFat);
     FatBinaryName = Filename;
     ObjectBuffers =
-        getMachOFatMemoryBuffers(FatBinaryName, *MemoryBuffer, *FatBinary);
+        getMachOFatMemoryBuffers(FatBinaryName, *MemBuffer, *FatBinary);
   }
 
   Objects.reserve(ObjectBuffers.size());
diff --git a/llvm/tools/dsymutil/BinaryHolder.h b/llvm/tools/dsymutil/BinaryHolder.h
index 9cc7941..c78bff2 100644
--- a/llvm/tools/dsymutil/BinaryHolder.h
+++ b/llvm/tools/dsymutil/BinaryHolder.h
@@ -46,7 +46,7 @@ public:
   /// Base class shared by cached entries, representing objects and archives.
   class EntryBase {
   protected:
-    std::unique_ptr<MemoryBuffer> MemoryBuffer;
+    std::unique_ptr<MemoryBuffer> MemBuffer;
     std::unique_ptr<object::MachOUniversalBinary> FatBinary;
     std::string FatBinaryName;
   };
-- 
2.7.4