From 11bb3e46eb1af3c54af309711aab9e00d3db4e99 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Sun, 29 Jan 2017 00:51:17 +0000 Subject: [PATCH] [Orc][RPC] Remove a couple of redundant calls to abandonAllPendingResponses. appendCallAsync, which all RPC call functions ultimately build on, will call abandonAllPendingResponses on channel error. These extra calls are redundant. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293405 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ExecutionEngine/Orc/RPCUtils.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/llvm/ExecutionEngine/Orc/RPCUtils.h b/include/llvm/ExecutionEngine/Orc/RPCUtils.h index 272b480565b..8dd396672ee 100644 --- a/include/llvm/ExecutionEngine/Orc/RPCUtils.h +++ b/include/llvm/ExecutionEngine/Orc/RPCUtils.h @@ -1155,7 +1155,6 @@ public: return Error::success(); }, Args...)) { - this->abandonPendingResponses(); RTraits::consumeAbandoned(FutureResult.get()); return std::move(Err); } @@ -1188,12 +1187,6 @@ public: typename detail::ResultTraits::ErrorReturnType callB(const ArgTs &... Args) { if (auto FutureResOrErr = callNB(Args...)) { - if (auto Err = this->C.send()) { - this->abandonPendingResponses(); - detail::ResultTraits::consumeAbandoned( - std::move(FutureResOrErr->get())); - return std::move(Err); - } return FutureResOrErr->get(); } else return FutureResOrErr.takeError(); -- 2.50.1