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, 7 insertions, 7 deletions

diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
index 06b8415..3cff468 100644
--- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
+++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
@@ -711,7 +711,7 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
       case bitc::METADATA_STRINGS: {
         // Rewind and parse the strings.
         if (Error Err = IndexCursor.JumpToBit(CurrentPos))
-          return Err;
+          return std::move(Err);
         StringRef Blob;
         Record.clear();
         if (Expected<unsigned> MaybeRecord =
@@ -725,14 +725,14 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
           MDStringRef.push_back(Str);
         };
         if (auto Err = parseMetadataStrings(Record, Blob, IndexNextMDString))
-          return Err;
+          return std::move(Err);
         break;
       }
       case bitc::METADATA_INDEX_OFFSET: {
         // This is the offset to the index, when we see this we skip all the
         // records and load only an index to these.
         if (Error Err = IndexCursor.JumpToBit(CurrentPos))
-          return Err;
+          return std::move(Err);
         Record.clear();
         if (Expected<unsigned> MaybeRecord =
                 IndexCursor.readRecord(Entry.ID, Record))
@@ -744,7 +744,7 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
         auto Offset = Record[0] + (Record[1] << 32);
         auto BeginPos = IndexCursor.GetCurrentBitNo();
         if (Error Err = IndexCursor.JumpToBit(BeginPos + Offset))
-          return Err;
+          return std::move(Err);
         Expected<BitstreamEntry> MaybeEntry =
             IndexCursor.advanceSkippingSubblocks(
                 BitstreamCursor::AF_DontPopBlockAtEnd);
@@ -778,7 +778,7 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
       case bitc::METADATA_NAME: {
         // Named metadata need to be materialized now and aren't deferred.
         if (Error Err = IndexCursor.JumpToBit(CurrentPos))
-          return Err;
+          return std::move(Err);
         Record.clear();
 
         unsigned Code;
@@ -823,7 +823,7 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
         // FIXME: we need to do this early because we don't materialize global
         // value explicitly.
         if (Error Err = IndexCursor.JumpToBit(CurrentPos))
-          return Err;
+          return std::move(Err);
         Record.clear();
         if (Expected<unsigned> MaybeRecord =
                 IndexCursor.readRecord(Entry.ID, Record))
@@ -838,7 +838,7 @@ MetadataLoader::MetadataLoaderImpl::lazyLoadModuleMetadataBlock() {
         if (auto *GO = dyn_cast<GlobalObject>(ValueList[ValueID]))
           if (Error Err = parseGlobalObjectAttachment(
                   *GO, ArrayRef<uint64_t>(Record).slice(1)))
-            return Err;
+            return std::move(Err);
         break;
       }
       case bitc::METADATA_KIND: