[Offload] Respond to feedback and fix extra definition

Author: RossBrunton

offload/plugins-nextgen/common/include/OffloadErrcodes.inc renamed to offload/include/Shared/OffloadErrcodes.inc

@@ -21,7 +21,7 @@ if (CLANG_FORMAT)
     add_custom_command(TARGET OffloadGenerate POST_BUILD COMMAND ${CMAKE_COMMAND}
         -E copy_if_different ${FILES_TO_COPY} ${GEN_DIR})
     add_custom_command(TARGET OffloadGenerate POST_BUILD COMMAND ${CMAKE_COMMAND}
-        -E copy_if_different OffloadErrcodes.inc "${LIBOFFLOAD_ROOT}/../plugins-nextgen/common/include/OffloadErrcodes.inc")
+        -E copy_if_different OffloadErrcodes.inc "${LIBOMPTARGET_INCLUDE_DIR}/Shared/OffloadErrcodes.inc")
 else()
     message(WARNING "clang-format was not found, so the OffloadGenerate target\
         will not be available. Offload will still build, but you will not be\

offload/liboffload/API/CMakeLists.txt

@@ -21,22 +21,10 @@ namespace plugin {
 
 enum class ErrorCode {
 #define OFFLOAD_ERRC(Name, _, Value) Name = Value,
-#include "OffloadErrcodes.inc"
+#include "Shared/OffloadErrcodes.inc"
 #undef OFFLOAD_ERRC
 };
 
-class OffloadErrorCategory : public std::error_category {
-  const char *name() const noexcept override { return "Offload Error"; }
-  std::string message(int ev) const override {
-    switch (static_cast<ErrorCode>(ev)) {
-#define OFFLOAD_ERRC(Name, Desc, Value)                                        \
-  case ErrorCode::Name:                                                        \
-    return #Desc;
-#include "OffloadErrcodes.inc"
-#undef OFFLOAD_ERRC
-    }
-  }
-};
 } // namespace plugin
 } // namespace target
 } // namespace omp

offload/plugins-nextgen/common/include/OffloadError.h

@@ -13,9 +13,9 @@ using namespace llvm;
 using namespace llvm::omp::target::plugin;
 
 namespace {
-// FIXME: This class is only here to support the transition to llvm::Error. It
-// will be removed once this transition is complete. Clients should prefer to
-// deal with the Error value directly, rather than converting to error_code.
+// OffloadError inherits from llvm::StringError which requires a
+// std::error_code. Once/if that requirement is removed, then this
+// std::error_code machinery can be removed.
 class OffloadErrorCategory : public std::error_category {
 public:
   const char *name() const noexcept override { return "llvm.offload"; }
@@ -24,7 +24,7 @@ class OffloadErrorCategory : public std::error_category {
 #define OFFLOAD_ERRC(Name, Desc, Value)                                        \
   case ErrorCode::Name:                                                        \
     return #Desc;
-#include "OffloadErrcodes.inc"
+#include "Shared/OffloadErrcodes.inc"
 #undef OFFLOAD_ERRC
     }
     llvm_unreachable("Unrecognized offload ErrorCode");