[lld] r293824 - Revert r293820: Return Error instead of bool from mergeTypeStreams().

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Wed Feb 1 14:28:44 PST 2017


Author: ruiu
Date: Wed Feb  1 16:28:43 2017
New Revision: 293824

URL: http://llvm.org/viewvc/llvm-project?rev=293824&view=rev
Log:
Revert r293820: Return Error instead of bool from mergeTypeStreams().

It broke buildbots.

Modified:
    lld/trunk/COFF/PDB.cpp

Modified: lld/trunk/COFF/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/PDB.cpp?rev=293824&r1=293823&r2=293824&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Wed Feb  1 16:28:43 2017
@@ -96,8 +96,8 @@ static std::vector<uint8_t> mergeDebugT(
     msf::StreamReader Reader(Stream);
     if (auto EC = Reader.readArray(Types, Reader.getLength()))
       fatal(EC, "Reader::readArray failed");
-    if (auto Err = codeview::mergeTypeStreams(Builder, Types))
-      fatal(Err, "codeview::mergeTypeStreams failed");
+    if (!codeview::mergeTypeStreams(Builder, Types))
+      fatal("codeview::mergeTypeStreams failed");
   }
 
   // Construct section contents.




More information about the llvm-commits mailing list