From e487da165c87059448804aea3be06968e4ea09c2 Mon Sep 17 00:00:00 2001
From: Pete Cooper <peter_cooper@apple.com>
Date: Thu, 31 Mar 2016 00:35:50 +0000
Subject: [PATCH] Fix a bunch of -Wpessimizing-move issues.

Thanks to Rui for pointing out this warning was firing.

llvm-svn: 264977
---
 lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp | 2 +-
 lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp      | 2 +-
 lld/lib/ReaderWriter/MachO/WriterMachO.cpp                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 0ec7a40..5eb5924 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -779,7 +779,7 @@ llvm::Error MachOFileLayout::writeLoadCommands() {
     // Object files have one unnamed segment which holds all sections.
     if (_is64) {
      if (auto ec = writeSingleSegmentLoadCommand<MachO64Trait>(lc))
-       return std::move(ec);
+       return ec;
     } else {
       if (auto ec = writeSingleSegmentLoadCommand<MachO32Trait>(lc))
         return std::move(ec);
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index e419739..fc760a3 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -1177,7 +1177,7 @@ normalizedObjectToAtoms(MachOFile *file,
       continue;
     if (llvm::Error ec = convertRelocs(sect, normalizedFile, scatterable,
                                        *file, *handler))
-      return std::move(ec);
+      return ec;
   }
 
   // Add additional arch-specific References
diff --git a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
index 972f987..f08487f 100644
--- a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
+++ b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
@@ -33,13 +33,13 @@ public:
     llvm::Expected<std::unique_ptr<NormalizedFile>> nFile =
         normalized::normalizedFromAtoms(file, _ctx);
     if (auto ec = nFile.takeError())
-      return std::move(ec);
+      return ec;
 
     // For testing, write out yaml form of normalized file.
     if (_ctx.printAtoms()) {
       std::unique_ptr<Writer> yamlWriter = createWriterYAML(_ctx);
       if (auto ec = yamlWriter->writeFile(file, "-"))
-        return std::move(ec);
+        return ec;
     }
 
     // Write normalized file as mach-o binary.
-- 
2.7.4