commit c55cf4afa9161bb4413b7ca9933d553327f5f069
author Bill Wendling <isanbard@gmail.com> Mon Feb 10 07:06:45 2020 -0800
committer Bill Wendling <isanbard@gmail.com> Mon Feb 10 07:07:40 2020 -0800
tree e4917b94d3e0be14dc470fb2a5d417f2f75acca6
parent 5ad62d3b7f7e75df776a4524bda0c9a1a9952a4e

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.

llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp

diff --git a/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp b/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
index 3f435f6..f1114e9 100644
--- a/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
@@ -547,7 +547,7 @@
   uint8_t *NextField = &AugInfo.Fields[0];
 
   if (auto Err = RecordReader.readInteger(NextChar))
-    return Err;
+    return std::move(Err);
 
   while (NextChar != 0) {
     switch (NextChar) {
@@ -556,7 +556,7 @@
       break;
     case 'e':
       if (auto Err = RecordReader.readInteger(NextChar))
-        return Err;
+        return std::move(Err);
       if (NextChar != 'h')
         return make_error<JITLinkError>("Unrecognized substring e" +
                                         Twine(NextChar) +
@@ -575,10 +575,10 @@
     }
 
     if (auto Err = RecordReader.readInteger(NextChar))
-      return Err;
+      return std::move(Err);
   }
 
-  return AugInfo;
+  return std::move(AugInfo);
 }
 
 Expected<JITTargetAddress>
@@ -589,11 +589,11 @@
   JITTargetAddress Addr;
   if (G.getPointerSize() == 8) {
     if (auto Err = RecordReader.readInteger(Addr))
-      return Err;
+      return std::move(Err);
   } else if (G.getPointerSize() == 4) {
     uint32_t Addr32;
     if (auto Err = RecordReader.readInteger(Addr32))
-      return Err;
+      return std::move(Err);
     Addr = Addr32;
   } else
     llvm_unreachable("Pointer size is not 32-bit or 64-bit");

llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp

diff --git a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
index eeb0a4e..89eef57 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
@@ -28,19 +28,19 @@
     return make_error<JITLinkError>("Object is not a relocatable MachO");
 
   if (auto Err = createNormalizedSections())
-    return Err;
+    return std::move(Err);
 
   if (auto Err = createNormalizedSymbols())
-    return Err;
+    return std::move(Err);
 
   if (auto Err = graphifyRegularSymbols())
-    return Err;
+    return std::move(Err);
 
   if (auto Err = graphifySectionsWithCustomParsers())
-    return Err;
+    return std::move(Err);
 
   if (auto Err = addRelocations())
-    return Err;
+    return std::move(Err);
 
   return std::move(G);
 }