vendor/lld/lld-release_39-r276489

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/ReaderWriter/MachO/WriterMachO.cpp b/lib/ReaderWriter/MachO/WriterMachO.cpp
index cce0a179608c..f08487f21ac1 100644
--- a/lib/ReaderWriter/MachO/WriterMachO.cpp
+++ b/lib/ReaderWriter/MachO/WriterMachO.cpp
@@ -28,17 +28,18 @@ class MachOWriter : public Writer {
 public:
   MachOWriter(const MachOLinkingContext &ctxt) : _ctx(ctxt) {}
 
-  std::error_code writeFile(const lld::File &file, StringRef path) override {
+  llvm::Error writeFile(const lld::File &file, StringRef path) override {
     // Construct empty normalized file from atoms.
-    ErrorOr<std::unique_ptr<NormalizedFile>> nFile =
+    llvm::Expected<std::unique_ptr<NormalizedFile>> nFile =
         normalized::normalizedFromAtoms(file, _ctx);
-    if (std::error_code ec = nFile.getError())
+    if (auto ec = nFile.takeError())
       return ec;
 
     // For testing, write out yaml form of normalized file.
     if (_ctx.printAtoms()) {
       std::unique_ptr<Writer> yamlWriter = createWriterYAML(_ctx);
-      yamlWriter->writeFile(file, "-");
+      if (auto ec = yamlWriter->writeFile(file, "-"))
+        return ec;
     }
 
     // Write normalized file as mach-o binary.