diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-24 18:51:30 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-24 18:51:30 +0000 |
| commit | ab5696ba8204293e4a37e8fa21896ee467ae9b29 (patch) | |
| tree | fc3624e0a0579d505ef1e174eaff4063cf10bbce /lld/lib/ReaderWriter/FileArchive.cpp | |
| parent | c1d535af0577d9d5f44954975ba907624ee8de11 (diff) | |
| download | bcm5719-llvm-ab5696ba8204293e4a37e8fa21896ee467ae9b29.tar.gz bcm5719-llvm-ab5696ba8204293e4a37e8fa21896ee467ae9b29.zip | |
Return ErrorOr<std::unique_ptr<File>>. NFC.
llvm-svn: 235744
Diffstat (limited to 'lld/lib/ReaderWriter/FileArchive.cpp')
| -rw-r--r-- | lld/lib/ReaderWriter/FileArchive.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/FileArchive.cpp b/lld/lib/ReaderWriter/FileArchive.cpp index 4f7863d225b..2128d8586b4 100644 --- a/lld/lib/ReaderWriter/FileArchive.cpp +++ b/lld/lib/ReaderWriter/FileArchive.cpp @@ -173,11 +173,12 @@ private: std::unique_ptr<MemoryBuffer> memberMB(MemoryBuffer::getMemBuffer( mb.getBuffer(), mb.getBufferIdentifier(), false)); - std::unique_ptr<File> file; - if (std::error_code ec = _registry.loadFile(std::move(memberMB), file)) + ErrorOr<std::unique_ptr<File>> fileOrErr = + _registry.loadFile(std::move(memberMB)); + if (std::error_code ec = fileOrErr.getError()) return ec; std::vector<std::unique_ptr<File>> files; - files.push_back(std::move(file)); + files.push_back(std::move(fileOrErr.get())); assert(files.size() == 1); result = std::move(files[0]); if (std::error_code ec = result->parse()) |
