diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-11-05 14:40:28 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-11-05 14:40:28 +0000 |
commit | 8f3a6aeadb9dbd710fe941dbc863a8bbc5389a4b (patch) | |
tree | 8070b633dd1d28c2df23edfcf3c9549c2e1c5277 | |
parent | 543f29d1a93cd75f76433692bd514c33c2055f97 (diff) | |
download | bcm5719-llvm-8f3a6aeadb9dbd710fe941dbc863a8bbc5389a4b.tar.gz bcm5719-llvm-8f3a6aeadb9dbd710fe941dbc863a8bbc5389a4b.zip |
Avoid implicit Archive::child_iterator construction.
llvm-svn: 252167
-rw-r--r-- | lld/ELF/InputFiles.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index f5a142ac7c1..ed6bb838181 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -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; |