OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Matching change needed to lld for llvm trunk change r277177. 

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