[Orc][RPC] Add an RPCFunctionNotSupported error type and return it from

negotiateFunction where appropriate.

Replacing the old ECError with a custom type allows us to attach the name of
the function that could not be negotiated, enabling better diagnostics for
negotiation failures.

llvm-svn: 292055

1 files changed, 20 insertions, 0 deletions

diff --git a/llvm/lib/ExecutionEngine/Orc/OrcError.cpp b/llvm/lib/ExecutionEngine/Orc/OrcError.cpp
index c531fe36992..eaa75ad06a2 100644
--- a/llvm/lib/ExecutionEngine/Orc/OrcError.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/OrcError.cpp
@@ -58,10 +58,30 @@ static ManagedStatic<OrcErrorCategory> OrcErrCat;
 namespace llvm {
 namespace orc {
 
+char RPCFunctionNotSupported::ID = 0;
+
 Error orcError(OrcErrorCode ErrCode) {
   typedef std::underlying_type<OrcErrorCode>::type UT;
   return errorCodeToError(
       std::error_code(static_cast<UT>(ErrCode), *OrcErrCat));
 }
+
+RPCFunctionNotSupported::RPCFunctionNotSupported(std::string RPCFunctionSignature)
+  : RPCFunctionSignature(std::move(RPCFunctionSignature)) {}
+
+std::error_code RPCFunctionNotSupported::convertToErrorCode() const {
+  typedef std::underlying_type<OrcErrorCode>::type UT;
+  return std::error_code(static_cast<UT>(OrcErrorCode::UnknownRPCFunction),
+                         *OrcErrCat);
+}
+
+void RPCFunctionNotSupported::log(raw_ostream &OS) const {
+  OS << "Could not negotiate RPC function '" << RPCFunctionSignature << "'";
+}
+
+const std::string &RPCFunctionNotSupported::getFunctionSignature() const {
+  return RPCFunctionSignature;
+}
+
 }
 }