[lld] r317657 - Update for llvm change.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 7 17:50:34 PST 2017


Author: rafael
Date: Tue Nov  7 17:50:34 2017
New Revision: 317657

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

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

Modified: lld/trunk/COFF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Writer.cpp?rev=317657&r1=317656&r2=317657&view=diff
==============================================================================
--- lld/trunk/COFF/Writer.cpp (original)
+++ lld/trunk/COFF/Writer.cpp Tue Nov  7 17:50:34 2017
@@ -314,8 +314,8 @@ void Writer::run() {
 
   writeMapFile(OutputSections);
 
-  if (auto EC = Buffer->commit())
-    fatal("failed to write the output file: " + EC.message());
+  if (auto E = Buffer->commit())
+    fatal("failed to write the output file: " + toString(std::move(E)));
 }
 
 static StringRef getOutputSection(StringRef Name) {

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=317657&r1=317656&r2=317657&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Tue Nov  7 17:50:34 2017
@@ -242,8 +242,8 @@ template <class ELFT> void Writer<ELFT>:
   if (errorCount())
     return;
 
-  if (auto EC = Buffer->commit())
-    error("failed to write to the output file: " + EC.message());
+  if (auto E = Buffer->commit())
+    error("failed to write to the output file: " + toString(std::move(E)));
 }
 
 // Initialize Out members.

Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp?rev=317657&r1=317656&r2=317657&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp Tue Nov  7 17:50:34 2017
@@ -1535,7 +1535,8 @@ llvm::Error MachOFileLayout::writeBinary
     return ec;
   writeSectionContent();
   writeLinkEditContent();
-  fob->commit();
+  if (Error E = fob->commit())
+    return E;
 
   return llvm::Error::success();
 }




More information about the llvm-commits mailing list