diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-15 22:46:53 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-15 22:46:53 +0000 |
commit | 0a74a60bc4a16e7c74c614642fa8c63d99a2772c (patch) | |
tree | 87c5c9be23af1ea533315a84238fdd36657a8ffd /llvm/lib/Object/ArchiveWriter.cpp | |
parent | e2d03448ba7944e8f983ddd95d50a20e9433777c (diff) | |
download | bcm5719-llvm-0a74a60bc4a16e7c74c614642fa8c63d99a2772c.tar.gz bcm5719-llvm-0a74a60bc4a16e7c74c614642fa8c63d99a2772c.zip |
For new archive member we only need to store the full path.
We were storing both the path and the file name, which was redundant
and easy to get confused up with.
llvm-svn: 242347
Diffstat (limited to 'llvm/lib/Object/ArchiveWriter.cpp')
-rw-r--r-- | llvm/lib/Object/ArchiveWriter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Object/ArchiveWriter.cpp b/llvm/lib/Object/ArchiveWriter.cpp index b555b8cfdcf..2aa481381df 100644 --- a/llvm/lib/Object/ArchiveWriter.cpp +++ b/llvm/lib/Object/ArchiveWriter.cpp @@ -38,8 +38,8 @@ NewArchiveIterator::NewArchiveIterator(object::Archive::child_iterator I, StringRef Name) : IsNewMember(false), Name(Name), OldI(I) {} -NewArchiveIterator::NewArchiveIterator(StringRef NewFilename, StringRef Name) - : IsNewMember(true), Name(Name), NewFilename(NewFilename) {} +NewArchiveIterator::NewArchiveIterator(StringRef FileName) + : IsNewMember(true), Name(FileName) {} StringRef NewArchiveIterator::getName() const { return Name; } @@ -52,14 +52,14 @@ object::Archive::child_iterator NewArchiveIterator::getOld() const { StringRef NewArchiveIterator::getNew() const { assert(IsNewMember); - return NewFilename; + return Name; } llvm::ErrorOr<int> NewArchiveIterator::getFD(sys::fs::file_status &NewStatus) const { assert(IsNewMember); int NewFD; - if (auto EC = sys::fs::openFileForRead(NewFilename, NewFD)) + if (auto EC = sys::fs::openFileForRead(Name, NewFD)) return EC; assert(NewFD != -1); |