Merge pull request #2570 from isaacault/copy_to_move

Fix Coverity COPY_INSTEAD_OF_MOVE defects.
oneapi-src · Jan 16, 2025 · af4ab49 · af4ab49
2 parents 21866c2 + fd899e4
commit af4ab49
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/source/common/logger/ur_logger.hpp b/source/common/logger/ur_logger.hpp
@@ -148,7 +148,7 @@ inline Logger create_logger(std::string logger_name, bool skip_prefix,
             map->erase(kv);
         }
 
-        std::vector<std::string> values = {default_output};
+        std::vector<std::string> values = {std::move(default_output)};
         kv = map->find("output");
         if (kv != map->end()) {
             values = kv->second;

diff --git a/source/loader/layers/sanitizer/asan/asan_interceptor.cpp b/source/loader/layers/sanitizer/asan/asan_interceptor.cpp
@@ -495,7 +495,7 @@ ur_result_t AsanInterceptor::registerSpirKernels(ur_program_handle_t Program) {
             getContext()->logger.info(
                 "SpirKernel(name='{}', isInstrumented={})", KernelName, true);
 
-            PI->InstrumentedKernels.insert(KernelName);
+            PI->InstrumentedKernels.insert(std::move(KernelName));
         }
         getContext()->logger.info("Number of sanitized kernel: {}",
                                   PI->InstrumentedKernels.size());

diff --git a/source/loader/layers/sanitizer/msan/msan_buffer.hpp b/source/loader/layers/sanitizer/msan/msan_buffer.hpp
@@ -28,7 +28,8 @@ struct MemBuffer {
 
     // Sub-buffer constructor
     MemBuffer(std::shared_ptr<MemBuffer> Parent, size_t Origin, size_t Size)
-        : Context(Parent->Context), Size(Size), SubBuffer{{Parent, Origin}} {}
+        : Context(Parent->Context),
+          Size(Size), SubBuffer{{std::move(Parent), Origin}} {}
 
     ur_result_t getHandle(ur_device_handle_t Device, char *&Handle);
 

diff --git a/source/loader/layers/sanitizer/msan/msan_interceptor.cpp b/source/loader/layers/sanitizer/msan/msan_interceptor.cpp
@@ -228,7 +228,7 @@ ur_result_t MsanInterceptor::registerSpirKernels(ur_program_handle_t Program) {
             getContext()->logger.info(
                 "SpirKernel(name='{}', isInstrumented={})", KernelName, true);
 
-            PI->InstrumentedKernels.insert(KernelName);
+            PI->InstrumentedKernels.insert(std::move(KernelName));
         }
         getContext()->logger.info("Number of sanitized kernel: {}",
                                   PI->InstrumentedKernels.size());

diff --git a/test/conformance/source/environment.cpp b/test/conformance/source/environment.cpp
@@ -279,7 +279,7 @@ void KernelsEnvironment::LoadSource(
     auto binary_ptr =
         std::make_shared<std::vector<char>>(std::move(device_binary));
     cached_kernels[kernel_name] = binary_ptr;
-    binary_out = binary_ptr;
+    binary_out = std::move(binary_ptr);
 }
 
 ur_result_t KernelsEnvironment::CreateProgram(

diff --git a/test/conformance/testing/include/uur/known_failure.h b/test/conformance/testing/include/uur/known_failure.h
@@ -17,8 +17,8 @@ namespace uur {
 struct Matcher {
     Matcher(uint32_t adapterVersion, ur_adapter_backend_t backend,
             std::vector<std::string> deviceNames)
-        : adapterVersion(adapterVersion), backend(backend), names(deviceNames) {
-    }
+        : adapterVersion(adapterVersion), backend(backend),
+          names(std::move(deviceNames)) {}
 
     uint32_t adapterVersion;
     ur_adapter_backend_t backend;