[NFC]Avoid std::move local objects and fix ctad warning (#18297)

Author: jsji

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -2136,7 +2136,7 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
         SYCLBIN::SYCLBINModuleDesc MD;
         MD.ArchString = LinkerArgs.getLastArgValue(OPT_arch_EQ);
         MD.SplitModules = std::move(SplitModules);
-        std::scoped_lock Guard(SYCLBINModulesMtx);
+        std::scoped_lock<std::mutex> Guard(SYCLBINModulesMtx);
         SYCLBINModules.emplace_back(std::move(MD));
       } else {
         // TODO(NOM7): Remove this call and use community flow for bundle/wrap

llvm/lib/Object/SYCLBIN.cpp

@@ -205,7 +205,7 @@ Error SYCLBIN::write(const SYCLBIN::SYCLBINDesc &Desc, raw_ostream &OS) {
   FileHeader.MetadataByteTableSize = Desc.getMetadataTableByteSize();
   if (Error E = Desc.getBinaryTableByteSize().moveInto(
           FileHeader.BinaryByteTableSize))
-    return std::move(E);
+    return E;
   OS << StringRef(reinterpret_cast<char *>(&FileHeader), sizeof(FileHeader));
   OS.write_zeros(alignTo(OS.tell(), 8) - OS.tell());
   HeaderTrackedMetadataOffset += FileHeader.GlobalMetadataSize;

llvm/unittests/Object/SYCLBINTest.cpp

@@ -44,7 +44,7 @@ class ManagedBinaryFile {
     std::unique_ptr<FileOutputBuffer> Output = std::move(*OutputOrErr);
     llvm::copy(Data, Output->getBufferStart());
     if (Error E = Output->commit())
-      return std::move(E);
+      return E;
 
     return std::move(ManagedFile);
   }
@@ -63,7 +63,7 @@ std::vector<uint8_t> generateRandomImage() {
       std::numeric_limits<uint8_t>::min(), std::numeric_limits<uint8_t>::max());
   std::vector<uint8_t> Image(SizeDist(Rng));
   std::generate(Image.begin(), Image.end(), [&]() { return BinaryDist(Rng); });
-  return std::move(Image);
+  return Image;
 }
 
 } // namespace