[lld] r293847 - Re-submit r293820: Return Error instead of bool from mergeTypeStreams().

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Feb  1 18:47:10 2017
New Revision: 293847

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

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=293847&r1=293846&r2=293847&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Wed Feb  1 18:47:10 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 (!codeview::mergeTypeStreams(Builder, Types))
-      fatal("codeview::mergeTypeStreams failed");
+    if (auto Err = codeview::mergeTypeStreams(Builder, Types))
+      fatal(Err, "codeview::mergeTypeStreams failed");
   }
 
   // Construct section contents.