[llvm] r363439 - [Remarks] Use the RemarkSetup error in setupOptimizationRemarks

[Francis Visoiu Mistrih via llvm-commits]

Author: thegameg
Date: Fri Jun 14 11:18:26 2019
New Revision: 363439

URL: http://llvm.org/viewvc/llvm-project?rev=363439&view=rev
Log:
[Remarks] Use the RemarkSetup error in setupOptimizationRemarks

Added the errors in r363415 but they were not used in the
RemarkStreamer.

Modified:
    llvm/trunk/lib/IR/RemarkStreamer.cpp

Modified: llvm/trunk/lib/IR/RemarkStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/RemarkStreamer.cpp?rev=363439&r1=363438&r2=363439&view=diff
==============================================================================
--- llvm/trunk/lib/IR/RemarkStreamer.cpp (original)
+++ llvm/trunk/lib/IR/RemarkStreamer.cpp Fri Jun 14 11:18:26 2019
@@ -129,7 +129,7 @@ llvm::setupOptimizationRemarks(LLVMConte
   // We don't use llvm::FileError here because some diagnostics want the file
   // name separately.
   if (EC)
-    return errorCodeToError(EC);
+    return make_error<RemarkSetupFileError>(errorCodeToError(EC));
 
   Context.setRemarkStreamer(llvm::make_unique<RemarkStreamer>(
       RemarksFilename,
@@ -137,7 +137,7 @@ llvm::setupOptimizationRemarks(LLVMConte
 
   if (!RemarksPasses.empty())
     if (Error E = Context.getRemarkStreamer()->setFilter(RemarksPasses))
-      return std::move(E);
+      return make_error<RemarkSetupPatternError>(std::move(E));
 
   return std::move(RemarksFile);
 }