RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-04 03:06:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dsymutil] Rename conflicting declaration

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

llvm-svn: 335995
This commit is contained in:
Jonas Devlieghere 2018-06-29 17:11:34 +00:00
parent d96db9ff80
commit 548fff58d8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/dsymutil/BinaryHolder.cpp
View File

@ -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());

2
tools/dsymutil/BinaryHolder.h
View File

@ -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;
};