Return an ErrorOr<std::unique_ptr<File>>. NFC.

llvm-svn: 235741

1 files changed, 12 insertions, 10 deletions

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index 45757eeef1c..c0d850039ae 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -522,11 +522,12 @@ public:
             mb.getBufferSize() > 32);
   }
 
-  std::error_code loadFile(std::unique_ptr<MemoryBuffer> mb,
-                           const Registry &registry,
-                           std::unique_ptr<File> &result) const override {
-    result = llvm::make_unique<MachOFile>(std::move(mb), &_ctx);
-    return std::error_code();
+  ErrorOr<std::unique_ptr<File>>
+  loadFile(std::unique_ptr<MemoryBuffer> mb,
+           const Registry &registry) const override {
+    std::unique_ptr<File> ret =
+        llvm::make_unique<MachOFile>(std::move(mb), &_ctx);
+    return std::move(ret);
   }
 
 private:
@@ -547,11 +548,12 @@ public:
     }
   }
 
-  std::error_code loadFile(std::unique_ptr<MemoryBuffer> mb,
-                           const Registry &registry,
-                           std::unique_ptr<File> &result) const override {
-    result = llvm::make_unique<MachODylibFile>(std::move(mb), &_ctx);
-    return std::error_code();
+  ErrorOr<std::unique_ptr<File>>
+  loadFile(std::unique_ptr<MemoryBuffer> mb,
+           const Registry &registry) const override {
+    std::unique_ptr<File> ret =
+        llvm::make_unique<MachODylibFile>(std::move(mb), &_ctx);
+    return std::move(ret);
   }
 
 private: