[lld] r305033 - Use check() to report an error.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Thu Jun 8 16:43:45 PDT 2017


Author: ruiu
Date: Thu Jun  8 18:43:44 2017
New Revision: 305033

URL: http://llvm.org/viewvc/llvm-project?rev=305033&view=rev
Log:
Use check() to report an error.

Modified:
    lld/trunk/COFF/Driver.cpp

Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=305033&r1=305032&r2=305033&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Thu Jun  8 18:43:44 2017
@@ -456,17 +456,11 @@ static void createImportLibrary() {
 static void parseModuleDefs(StringRef Path) {
   std::unique_ptr<MemoryBuffer> MB = check(
     MemoryBuffer::getFile(Path, -1, false, true), "could not open " + Path);
-  MemoryBufferRef MBRef = MB->getMemBufferRef();
+  COFFModuleDefinition M =
+      check(parseCOFFModuleDefinition(MB->getMemBufferRef(), Config->Machine));
 
-  Expected<COFFModuleDefinition> Def =
-      parseCOFFModuleDefinition(MBRef, Config->Machine);
-  if (!Def)
-    fatal(errorToErrorCode(Def.takeError()).message());
-
-  COFFModuleDefinition &M = *Def;
   if (Config->OutputFile.empty())
     Config->OutputFile = Saver.save(M.OutputFile);
-
   if (M.ImageBase)
     Config->ImageBase = M.ImageBase;
   if (M.StackReserve)




More information about the llvm-commits mailing list