Revert "Remove redundant "std::move"s in return statements"

The build failed with

  error: call to deleted constructor of 'llvm::Error'

errors.

This reverts commit 1c2241a7936bf85aa68aef94bd40c3ba77d8ddf2.

1 files changed, 9 insertions, 9 deletions

diff --git a/llvm/tools/llvm-rc/ResourceScriptParser.cpp b/llvm/tools/llvm-rc/ResourceScriptParser.cpp
index 62adb51..36b3056 100644
--- a/llvm/tools/llvm-rc/ResourceScriptParser.cpp
+++ b/llvm/tools/llvm-rc/ResourceScriptParser.cpp
@@ -19,7 +19,7 @@
 // Take an expression returning llvm::Error and forward the error if it exists.
 #define RETURN_IF_ERROR(Expr)                                                  \
   if (auto Err = (Expr))                                                       \
-    return Err;           
+    return std::move(Err);
 
 // Take an expression returning llvm::Expected<T> and assign it to Var or
 // forward the error out of the function.
@@ -295,7 +295,7 @@ Expected<SmallVector<RCInt, 8>> RCParser::readIntsWithCommas(size_t MinCount,
   auto FailureHandler =
       [&](llvm::Error Err) -> Expected<SmallVector<RCInt, 8>> {
     if (Result.size() < MinCount)
-      return Err;
+      return std::move(Err);
     consumeError(std::move(Err));
     return Result;
   };
@@ -315,7 +315,7 @@ Expected<SmallVector<RCInt, 8>> RCParser::readIntsWithCommas(size_t MinCount,
       return FailureHandler(IntResult.takeError());
   }
 
-  return Result;
+  return std::move(Result);
 }
 
 Expected<uint32_t> RCParser::parseFlags(ArrayRef<StringRef> FlagDesc,
@@ -386,7 +386,7 @@ RCParser::parseOptionalStatements(OptStmtType StmtsType) {
     Result.addStmt(std::move(*SingleParse));
   }
 
-  return Result;
+  return std::move(Result);
 }
 
 Expected<std::unique_ptr<OptionalStmt>>
@@ -442,7 +442,7 @@ RCParser::ParseType RCParser::parseAcceleratorsResource() {
     Accels->addAccelerator(*EventResult, *IDResult, *FlagsResult);
   }
 
-  return Accels;
+  return std::move(Accels);
 }
 
 RCParser::ParseType RCParser::parseCursorResource() {
@@ -484,7 +484,7 @@ RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) {
     Dialog->addControl(std::move(*ControlDefResult));
   }
 
-  return Dialog;
+  return std::move(Dialog);
 }
 
 RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) {
@@ -679,7 +679,7 @@ Expected<MenuDefinitionList> RCParser::parseMenuItemsList() {
         std::make_unique<MenuItem>(*CaptionResult, MenuResult, *FlagsResult));
   }
 
-  return List;
+  return std::move(List);
 }
 
 RCParser::ParseType RCParser::parseStringTableResource() {
@@ -702,7 +702,7 @@ RCParser::ParseType RCParser::parseStringTableResource() {
     Table->addString(*IDResult, *StrResult);
   }
 
-  return Table;
+  return std::move(Table);
 }
 
 Expected<std::unique_ptr<VersionInfoBlock>>
@@ -718,7 +718,7 @@ RCParser::parseVersionInfoBlockContents(StringRef BlockName) {
 
   consume(); // Consume BlockEnd.
 
-  return Contents;
+  return std::move(Contents);
 }
 
 Expected<std::unique_ptr<VersionInfoStmt>> RCParser::parseVersionInfoStmt() {