[Remarks] Use the RemarkSetup error in setupOptimizationRemarks

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363439 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/IR/RemarkStreamer.cpp b/lib/IR/RemarkStreamer.cpp
index fe9cea0d5b5820e1107dd08707d32ce8f6d9eddd..e0f9a9d70c36d9a0a2e788132454557415de9c00 100644 (file)
--- a/lib/IR/RemarkStreamer.cpp
+++ b/lib/IR/RemarkStreamer.cpp
@@ -129,7 +129,7 @@ llvm::setupOptimizationRemarks(LLVMContext &Context, StringRef RemarksFilename,
   // 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(LLVMContext &Context, StringRef RemarksFilename,
 
   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);
 }