[Openmp-commits] [openmp] 0484237 - [OpenMP] Fix build warnings

[Shao-Ce SUN via Openmp-commits]

Author: Shao-Ce SUN
Date: 2023-07-09T22:12:23+08:00
New Revision: 048423702d4b0f2c61d7d98c84ab5e7edc05f4ec

URL: https://github.com/llvm/llvm-project/commit/048423702d4b0f2c61d7d98c84ab5e7edc05f4ec
DIFF: https://github.com/llvm/llvm-project/commit/048423702d4b0f2c61d7d98c84ab5e7edc05f4ec.diff

LOG: [OpenMP] Fix build warnings

```
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.
```

```
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.
```

Reviewed By: jhuber6

Differential Revision: https://reviews.llvm.org/D154787

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
index e0224955a7de94..35c1159e33b241 100644
--- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -455,7 +455,7 @@ Error GenericDeviceTy::deinit() {
 
   if (RPCHandle)
     if (auto Err = RPCHandle->deinitDevice())
-      return std::move(Err);
+      return Err;
 
   return deinitImpl();
 }
@@ -549,7 +549,7 @@ Error GenericDeviceTy::setupRPCServer(GenericPluginTy &Plugin,
     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)

diff  --git a/openmp/libomptarget/src/private.h b/openmp/libomptarget/src/private.h
index 8b62c164039f10..14dafef09a6334 100644
--- a/openmp/libomptarget/src/private.h
+++ b/openmp/libomptarget/src/private.h
@@ -257,7 +257,9 @@ struct TargetMemcpyArgsTy {
 #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