replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid implicitly constructing a Archive::child_iterator. 

llvm-svn: 251794
This commit is contained in:
Rafael Espindola 2015-11-02 13:17:11 +00:00
parent c10e82087b
commit f82425851a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Object/ArchiveWriter.cpp
View File

@ -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)