[lld] r317650 - Update for llvm change.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Tue Nov  7 17:05:52 2017
New Revision: 317650

URL: http://llvm.org/viewvc/llvm-project?rev=317650&view=rev
Log:
Update for llvm change.

Modified:
    lld/trunk/ELF/Filesystem.cpp
    lld/trunk/ELF/Writer.cpp
    lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp

Modified: lld/trunk/ELF/Filesystem.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Filesystem.cpp?rev=317650&r1=317649&r2=317650&view=diff
==============================================================================
--- lld/trunk/ELF/Filesystem.cpp (original)
+++ lld/trunk/ELF/Filesystem.cpp Tue Nov  7 17:05:52 2017
@@ -81,5 +81,5 @@ void elf::unlinkAsync(StringRef Path) {
 std::error_code elf::tryCreateFile(StringRef Path) {
   if (Path.empty())
     return std::error_code();
-  return FileOutputBuffer::create(Path, 1).getError();
+  return errorToErrorCode(FileOutputBuffer::create(Path, 1).takeError());
 }

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=317650&r1=317649&r2=317650&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Tue Nov  7 17:05:52 2017
@@ -1798,12 +1798,13 @@ template <class ELFT> void Writer<ELFT>:
   }
 
   unlinkAsync(Config->OutputFile);
-  ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+  Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
       FileOutputBuffer::create(Config->OutputFile, FileSize,
                                FileOutputBuffer::F_executable);
 
-  if (auto EC = BufferOrErr.getError())
-    error("failed to open " + Config->OutputFile + ": " + EC.message());
+  if (!BufferOrErr)
+    error("failed to open " + Config->OutputFile + ": " +
+          llvm::toString(BufferOrErr.takeError()));
   else
     Buffer = std::move(*BufferOrErr);
 }

Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp?rev=317650&r1=317649&r2=317650&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp Tue Nov  7 17:05:52 2017
@@ -1523,10 +1523,10 @@ llvm::Error MachOFileLayout::writeBinary
   unsigned flags = 0;
   if (_file.fileType != llvm::MachO::MH_OBJECT)
     flags = llvm::FileOutputBuffer::F_executable;
-  ErrorOr<std::unique_ptr<llvm::FileOutputBuffer>> fobOrErr =
+  Expected<std::unique_ptr<llvm::FileOutputBuffer>> fobOrErr =
       llvm::FileOutputBuffer::create(path, size(), flags);
-  if (std::error_code ec = fobOrErr.getError())
-    return llvm::errorCodeToError(ec);
+  if (Error E = fobOrErr.takeError())
+    return E;
   std::unique_ptr<llvm::FileOutputBuffer> &fob = *fobOrErr;
   // Write content.
   _buffer = fob->getBufferStart();