[llvm] r280163 - [ORC][RPC] Fix some bugs in the callB primitive.

[Lang Hames via llvm-commits]

Author: lhames
Date: Tue Aug 30 16:29:48 2016
New Revision: 280163

URL: http://llvm.org/viewvc/llvm-project?rev=280163&view=rev
Log:
[ORC][RPC] Fix some bugs in the callB primitive.

Still no unit test due to synchronization bugs on s390. These issues were
discovered in an out-of-tree utility.


Modified:
    llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCUtils.h

Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCUtils.h?rev=280163&r1=280162&r2=280163&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCUtils.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCUtils.h Tue Aug 30 16:29:48 2016
@@ -536,13 +536,13 @@ public:
   /// handling responses and incoming calls.
   template <typename Func, typename... ArgTs>
   typename Func::ErrorReturn callB(ChannelT &C, const ArgTs &... Args) {
-    if (auto FutureResOrErr = callNBWithSeq(C, Args...)) {
+    if (auto FutureResOrErr = callNBWithSeq<Func>(C, Args...)) {
       if (auto Err = C.send()) {
         abandonOutstandingResults();
-        Func::consumeAbandoned(*FutureResOrErr);
+        Func::consumeAbandoned(FutureResOrErr->first);
         return std::move(Err);
       }
-      return FutureResOrErr->get();
+      return FutureResOrErr->first.get();
     } else
       return FutureResOrErr.takeError();
   }