Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-14 14:56:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Matching change needed to lld for llvm trunk change r277177.

Browse Source 
Where Archive::getMemoryBufferRef() was changed to return Expected<>

llvm-svn: 277183
This commit is contained in:
Kevin Enderby 2016-07-29 17:56:00 +00:00
parent b0c4376697
commit 01e41f11a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/lib/ReaderWriter/FileArchive.cpp
View File

@ -132,9 +132,9 @@ protected:
private:
std::error_code instantiateMember(Archive::Child member,
std::unique_ptr<File> &result) const {
ErrorOr<llvm::MemoryBufferRef> mbOrErr = member.getMemoryBufferRef();
if (std::error_code ec = mbOrErr.getError())
return ec;
Expected<llvm::MemoryBufferRef> mbOrErr = member.getMemoryBufferRef();
if (!mbOrErr)
return errorToErrorCode(mbOrErr.takeError());
llvm::MemoryBufferRef mb = mbOrErr.get();
std::string memberPath = (_archive->getFileName() + "("
+ mb.getBufferIdentifier() + ")").str();