diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-11-02 13:17:11 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-11-02 13:17:11 +0000 |
| commit | f82425851a410c2f3b2b3332e39d59898959b439 (patch) | |
| tree | 00634adb2f874b55f820a6d771792873bd8c0472 /llvm/lib/Object/ArchiveWriter.cpp | |
| parent | c10e82087b93a3f9a62ab1780b4bb4839a93740f (diff) | |
| download | bcm5719-llvm-f82425851a410c2f3b2b3332e39d59898959b439.tar.gz bcm5719-llvm-f82425851a410c2f3b2b3332e39d59898959b439.zip | |
Avoid implicitly constructing a Archive::child_iterator.
llvm-svn: 251794
Diffstat (limited to 'llvm/lib/Object/ArchiveWriter.cpp')
| -rw-r--r-- | llvm/lib/Object/ArchiveWriter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/llvm/lib/Object/ArchiveWriter.cpp b/llvm/lib/Object/ArchiveWriter.cpp index f14cbc0d657..b68f7efa53c 100644 --- a/llvm/lib/Object/ArchiveWriter.cpp +++ b/llvm/lib/Object/ArchiveWriter.cpp @@ -346,11 +346,11 @@ llvm::writeArchive(StringRef ArcName, Buffers.push_back(std::move(MemberBufferOrErr.get())); MemberRef = Buffers.back()->getMemBufferRef(); } else { - object::Archive::child_iterator OldMember = Member.getOld(); - assert((!Thin || OldMember->getParent()->isThin()) && + const object::Archive::Child &OldMember = Member.getOld(); + assert((!Thin || OldMember.getParent()->isThin()) && "Thin archives cannot refers to member of other archives"); ErrorOr<MemoryBufferRef> MemberBufferOrErr = - OldMember->getMemoryBufferRef(); + OldMember.getMemoryBufferRef(); if (auto EC = MemberBufferOrErr.getError()) return std::make_pair("", EC); MemberRef = MemberBufferOrErr.get(); @@ -397,11 +397,11 @@ llvm::writeArchive(StringRef ArcName, GID = Status.getGroup(); Perms = Status.permissions(); } else { - object::Archive::child_iterator OldMember = I.getOld(); - ModTime = OldMember->getLastModified(); - UID = OldMember->getUID(); - GID = OldMember->getGID(); - Perms = OldMember->getAccessMode(); + const object::Archive::Child &OldMember = I.getOld(); + ModTime = OldMember.getLastModified(); + UID = OldMember.getUID(); + GID = OldMember.getGID(); + Perms = OldMember.getAccessMode(); } if (I.isNewMember()) { @@ -411,9 +411,9 @@ llvm::writeArchive(StringRef ArcName, StringMapIndexIter, ModTime, UID, GID, Perms, Status.getSize()); } else { - object::Archive::child_iterator OldMember = I.getOld(); + const object::Archive::Child &OldMember = I.getOld(); printMemberHeader(Out, Kind, Thin, I.getName(), StringMapIndexIter, - ModTime, UID, GID, Perms, OldMember->getSize()); + ModTime, UID, GID, Perms, OldMember.getSize()); } if (!Thin) |
