intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-27 06:06:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid implicit Archive::child_iterator construction.

Browse Source 
llvm-svn: 252167
This commit is contained in:
Rafael Espindola
2015-11-05 14:40:28 +00:00
parent 543f29d1a9
commit 8f3a6aeadb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lld/ELF/InputFiles.cpp
View File

@@ -291,14 +291,14 @@ void ArchiveFile::parse() {
// Returns a buffer pointing to a member file containing a given symbol.
MemoryBufferRef ArchiveFile::getMember(const Archive::Symbol *Sym) {
ErrorOr<Archive::child_iterator> ItOrErr = Sym->getMember();
error(ItOrErr, "Could not get the member for symbol " + Sym->getName());
Archive::child_iterator It = *ItOrErr;
ErrorOr<Archive::Child> COrErr = Sym->getMember();
error(COrErr, "Could not get the member for symbol " + Sym->getName());
const Archive::Child &C = *COrErr;
if (!Seen.insert(It->getChildOffset()).second)
if (!Seen.insert(C.getChildOffset()).second)
return MemoryBufferRef();
ErrorOr<MemoryBufferRef> Ret = It->getMemoryBufferRef();
ErrorOr<MemoryBufferRef> Ret = C.getMemoryBufferRef();
error(Ret, "Could not get the buffer for the member defining symbol " +
Sym->getName());
return *Ret;