From 33b604d1c3017a6d09e47384566353efe7bbfe57 Mon Sep 17 00:00:00 2001
From: Joseph Huber <jhuber6@vols.utk.edu>
Date: Fri, 15 Apr 2022 21:18:56 -0400
Subject: [PATCH] [OpenMP] Fix linting diagnostics in the linker wrapper

Summary:
A previous patch had some linter warnings that should've been addressed.
---
 clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index d202b16516220..e187e57cd22c8 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -308,7 +308,7 @@ Error extractOffloadFiles(StringRef Contents, StringRef Prefix,
             createOutputFile(Prefix + "-" + Kind + "-" + Binary.getTriple() +
                                  "-" + Binary.getArch(),
                              Suffix, TempFile))
-      return std::move(Err);
+      return Err;
 
     Expected<std::unique_ptr<FileOutputBuffer>> OutputOrErr =
         FileOutputBuffer::create(TempFile, Binary.getImage().size());
@@ -318,7 +318,7 @@ Error extractOffloadFiles(StringRef Contents, StringRef Prefix,
     std::copy(Binary.getImage().bytes_begin(), Binary.getImage().bytes_end(),
               Output->getBufferStart());
     if (Error E = Output->commit())
-      return std::move(E);
+      return E;
 
     DeviceFiles.emplace_back(Kind, Binary.getTriple(), Binary.getArch(),
                              TempFile);