From d7472fa68e50e07eb09345a5810af05c0ef269c8 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 17 Jan 2017 04:07:48 +0000 Subject: [PATCH] [Orc][RPC] Return unsupported rpc function errors from the non-retry cases in negotiateFunction. These cases were accidentally left out of r292055, resulting in a less descriptive ECError being returned on these paths. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@292193 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ExecutionEngine/Orc/RPCUtils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/llvm/ExecutionEngine/Orc/RPCUtils.h b/include/llvm/ExecutionEngine/Orc/RPCUtils.h index 4be247a1cde..5267b50f744 100644 --- a/include/llvm/ExecutionEngine/Orc/RPCUtils.h +++ b/include/llvm/ExecutionEngine/Orc/RPCUtils.h @@ -1124,7 +1124,7 @@ public: if (auto RemoteIdOrErr = callB(Func::getPrototype())) { this->RemoteFunctionIds[Func::getPrototype()] = *RemoteIdOrErr; if (*RemoteIdOrErr == this->getInvalidFunctionId()) - return orcError(OrcErrorCode::UnknownRPCFunction); + return make_error(Func::getPrototype()); return Error::success(); } else return RemoteIdOrErr.takeError(); @@ -1262,7 +1262,7 @@ public: if (auto RemoteIdOrErr = callB(Func::getPrototype())) { this->RemoteFunctionIds[Func::getPrototype()] = *RemoteIdOrErr; if (*RemoteIdOrErr == this->getInvalidFunctionId()) - return orcError(OrcErrorCode::UnknownRPCFunction); + return make_error(Func::getPrototype()); return Error::success(); } else return RemoteIdOrErr.takeError(); -- 2.50.1