diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-04-05 22:04:44 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-04-05 22:04:44 +0000 |
| commit | e6d5609de458022aaf96950b78794d104f80df7c (patch) | |
| tree | 92de7e135dec230a1c5516125307d4c159a6fd68 /lld/lib/ReaderWriter/ReaderArchive.cpp | |
| parent | eb108bad50bb5198867544b773bd55c44cb3d2fe (diff) | |
| download | bcm5719-llvm-e6d5609de458022aaf96950b78794d104f80df7c.tar.gz bcm5719-llvm-e6d5609de458022aaf96950b78794d104f80df7c.zip | |
Revert "Correctly pass ownership of MemoryBuffers."
llvm-svn: 178918
Diffstat (limited to 'lld/lib/ReaderWriter/ReaderArchive.cpp')
| -rw-r--r-- | lld/lib/ReaderWriter/ReaderArchive.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lld/lib/ReaderWriter/ReaderArchive.cpp b/lld/lib/ReaderWriter/ReaderArchive.cpp index c59a04de927..1928e2fa0f7 100644 --- a/lld/lib/ReaderWriter/ReaderArchive.cpp +++ b/lld/lib/ReaderWriter/ReaderArchive.cpp @@ -48,7 +48,7 @@ public: if (_targetInfo.logInputFiles()) llvm::outs() << buff->getBufferIdentifier() << "\n"; std::unique_ptr<MemoryBuffer> mb(buff.take()); - if (_targetInfo.parseFile(std::move(mb), result)) + if (_targetInfo.parseFile(mb, result)) return nullptr; assert(result.size() == 1); @@ -159,9 +159,8 @@ public: // Returns a vector of Files that are contained in the archive file // pointed to by the MemoryBuffer -error_code -ReaderArchive::parseFile(std::unique_ptr<llvm::MemoryBuffer> mb, - std::vector<std::unique_ptr<File>> &result) const { +error_code ReaderArchive::parseFile(std::unique_ptr<llvm::MemoryBuffer> &mb, + std::vector<std::unique_ptr<File>> &result) const { error_code ec; if (_targetInfo.forceLoadAllArchives()) { @@ -177,7 +176,7 @@ ReaderArchive::parseFile(std::unique_ptr<llvm::MemoryBuffer> mb, std::unique_ptr<MemoryBuffer> mbc(buff.take()); if (_targetInfo.logInputFiles()) llvm::outs() << buff->getBufferIdentifier() << "\n"; - if ((ec = _targetInfo.parseFile(std::move(mbc), result))) + if ((ec = _targetInfo.parseFile(mbc, result))) return ec; } } else { |

