[Clang] Explicitly move returned values converted to expected

Summary:
These can cause failures on GCC-7 it seems. We should explicitly move
them to prevent this from causing build failures.

diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index c288236..5849e9c 100644 (file)
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -770,7 +770,7 @@ AMDGPUToolChain::getSystemGPUArchs(const ArgList &Args) const {
     return llvm::createStringError(std::error_code(),
                                    "No AMD GPU detected in the system");
 
-  return GPUArchs;
+  return std::move(GPUArchs);
 }
 
 void ROCMToolChain::addClangTargetOptions(

diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp
index 76f4da2..52dd0c2 100644 (file)
--- a/clang/lib/Driver/ToolChains/Cuda.cpp
+++ b/clang/lib/Driver/ToolChains/Cuda.cpp
@@ -794,7 +794,7 @@ CudaToolChain::getSystemGPUArchs(const ArgList &Args) const {
     return llvm::createStringError(std::error_code(),
                                    "No NVIDIA GPU detected in the system");
 
-  return GPUArchs;
+  return std::move(GPUArchs);
 }
 
 Tool *CudaToolChain::buildAssembler() const {