[Openmp-commits] [PATCH] D154787: [OpenMP] Fix build warnings

[Shao-Ce SUN via Phabricator via Openmp-commits]

sunshaoce created this revision.
sunshaoce added reviewers: dhruvachak, jhuber6, tianshilei1992, jdoerfert.
Herald added subscribers: guansong, yaxunl.
Herald added a project: All.
sunshaoce requested review of this revision.
Herald added subscribers: openmp-commits, jplehr, sstefan1.
Herald added a project: OpenMP.

  llvm-project/openmp/libomptarget/src/private.h:260:9: warning: 'DEBUG_PREFIX' macro redefined [-Wmacro-redefined]
  #define DEBUG_PREFIX GETNAME(TARGET_NAME)
          ^
  llvm-project/openmp/libomptarget/include/ompt_device_callbacks.h:22:9: note: previous definition is here
  #define DEBUG_PREFIX "OMPT"
          ^
  1 warning generated.



  shell
  llvm-project/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp:458:14: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
        return std::move(Err);
               ^
  llvm-project/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp:458:14: note: remove std::move call here
        return std::move(Err);
               ^~~~~~~~~~   ~
  llvm-project/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp:552:12: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
      return std::move(Err);
             ^
  llvm-project/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp:552:12: note: remove std::move call here
      return std::move(Err);
             ^~~~~~~~~~   ~
  2 warnings generated.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D154787

Files:
  openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
  openmp/libomptarget/src/private.h


Index: openmp/libomptarget/src/private.h
===================================================================
--- openmp/libomptarget/src/private.h
+++ openmp/libomptarget/src/private.h
@@ -257,7 +257,9 @@
 #endif
 
 #define TARGET_NAME Libomptarget
+#ifndef DEBUG_PREFIX
 #define DEBUG_PREFIX GETNAME(TARGET_NAME)
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 /// dump a table of all the host-target pointer pairs on failure
Index: openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
===================================================================
--- openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -455,7 +455,7 @@
 
   if (RPCHandle)
     if (auto Err = RPCHandle->deinitDevice())
-      return std::move(Err);
+      return Err;
 
   return deinitImpl();
 }
@@ -549,7 +549,7 @@
     return Plugin::success();
 
   if (auto Err = Server.initDevice(*this, Plugin.getGlobalHandler(), Image))
-    return std::move(Err);
+    return Err;
 
   auto DeviceOrErr = Server.getDevice(*this);
   if (!DeviceOrErr)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D154787.538425.patch
Type: text/x-patch
Size: 1203 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20230709/1ef2f222/attachment.bin>