summaryrefslogtreecommitdiffstats
path: root/lld/lib/Core/Reader.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-04-24 18:33:50 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-04-24 18:33:50 +0000
commitdedab912c3435f19b65191ff35825330077318bd (patch)
tree104b640bfbc42818737e4d101272e57984abac23 /lld/lib/Core/Reader.cpp
parent75e1172b195a2dfb8f5b796e4309238e040abc28 (diff)
downloadbcm5719-llvm-dedab912c3435f19b65191ff35825330077318bd.tar.gz
bcm5719-llvm-dedab912c3435f19b65191ff35825330077318bd.zip
Return an ErrorOr<std::unique_ptr<File>>. NFC.
llvm-svn: 235741
Diffstat (limited to 'lld/lib/Core/Reader.cpp')
-rw-r--r--lld/lib/Core/Reader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lld/lib/Core/Reader.cpp b/lld/lib/Core/Reader.cpp
index c97193dcf07..d27cc736dcd 100644
--- a/lld/lib/Core/Reader.cpp
+++ b/lld/lib/Core/Reader.cpp
@@ -38,8 +38,11 @@ std::error_code Registry::loadFile(std::unique_ptr<MemoryBuffer> mb,
for (const std::unique_ptr<Reader> &reader : _readers) {
if (!reader->canParse(fileType, *mb))
continue;
- if (std::error_code ec = reader->loadFile(std::move(mb), *this, result))
+ ErrorOr<std::unique_ptr<File>> fileOrErr =
+ reader->loadFile(std::move(mb), *this);
+ if (std::error_code ec = fileOrErr.getError())
return ec;
+ result = std::move(fileOrErr.get());
return std::error_code();
}
OpenPOWER on IntegriCloud