From b5630562d87e1fab27331f194cb885b33721fdef Mon Sep 17 00:00:00 2001 From: Francis Visoiu Mistrih Date: Fri, 14 Jun 2019 18:18:26 +0000 Subject: [PATCH] [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 --- lib/IR/RemarkStreamer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/IR/RemarkStreamer.cpp b/lib/IR/RemarkStreamer.cpp index fe9cea0d5b5..e0f9a9d70c3 100644 --- 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(errorCodeToError(EC)); Context.setRemarkStreamer(llvm::make_unique( 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(std::move(E)); return std::move(RemarksFile); } -- 2.40.0