<div dir="ltr">The tests still fail at runtime, because their std::future implementation constructs Error objects that are destroyed without being checked:<div><br><div><div>$ ./unittests/ExecutionEngine/Orc/OrcJITTests.exe --gtest_filter=DummyRPC.TestSerialization</div><div>Note: Google Test filter = DummyRPC.TestSerialization</div><div>[==========] Running 1 test from 1 test case.</div><div>[----------] Global test environment set-up.</div><div>[----------] 1 test from DummyRPC</div><div>[ RUN ] DummyRPC.TestSerialization</div><div>Program aborted due to an unhandled Error:</div><div>Error value was Success. (Note: Success values must still be checked prior to being destroyed).</div><div>#0 0x00d9bbe7 HandleAbort c:\src\llvm\lib\support\windows\signals.inc:404:0</div><div>#1 0x0175e7f5 raise d:\th\minkernel\crts\ucrt\src\appcrt\misc\signal.cpp:516:0</div><div>#2 0x01737b04 abort d:\th\minkernel\crts\ucrt\src\appcrt\startup\abort.cpp:64:0</div><div>#3 0x00bab53c llvm::Error::assertIsChecked(void) c:\src\llvm\include\llvm\support\error.h:235:0</div><div>#4 0x00bc3815 ?_Set_value_raw@?$_Associated_state@VError@llvm@@@std@@QAEX$$QAVError@llvm@@PAV?$unique_lock@Vmutex@std@@@2@_N@Z c:\program files (x86)\microsoft visual studio 14.0\vc\include\future:394:0</div><div>#5 0x00bc3721 ?_Set_value@?$_Associated_state@VError@llvm@@@std@@QAEX$$QAVError@llvm@@_N@Z c:\program files (x86)\microsoft visual studio 14.0\vc\include\future:386:0</div><div>#6 0x00bc574d ?set_value@?$promise@VError@llvm@@@std@@QAEX$$QAVError@llvm@@@Z c:\program files (x86)\microsoft visual studio 14.0\vc\include\future:1547:0</div><div>#7 0x00bc5464 llvm::orc::remote::RPC<class QueueChannel,unsigned int,unsigned short>::OutstandingResultImpl<class llvm::orc::remote::RPCBase::FunctionHelper<unsigned int,4,void (signed char,unsigned char,short,unsigned short,int,unsigned int,__int64,unsigned __int64,bool,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::vector<int,class std::allocator<int> >)> >::readResult(class QueueChannel &) c:\src\llvm\include\llvm\executionengine\orc\rpcutils.h:682:0</div><div>#8 0x00bc4e88 llvm::orc::remote::RPC<class QueueChannel,unsigned int,unsigned short>::handleResponse(class QueueChannel &,unsigned short *) c:\src\llvm\include\llvm\executionengine\orc\rpcutils.h:580:0</div><div>#9 0x00bc07a3 llvm::orc::remote::RPC<class QueueChannel,unsigned int,unsigned short>::waitForResult<class llvm::Error (class QueueChannel &,unsigned int)>(class QueueChannel &,unsigned short,class llvm::Error (&)(class QueueChannel &,unsigned int)) c:\src\llvm\include\llvm\executionengine\orc\rpcutils.h:605:0</div><div>#10 0x00bb7fe4 DummyRPC_TestSerialization_Test::TestBody(void) c:\src\llvm\unittests\executionengine\orc\rpcutilstest.cpp:178:0</div><div>#11 0x00f81e80 testing::internal::HandleSehExceptionsInMethodIfSupported<class testing::Test,void>(class testing::Test *,void ( testing::Test::*)(void),char const *) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:2075:0</div><div>#12 0x00f93b9d testing::Test::Run(void) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:2161:0</div><div>#13 0x00f93d92 testing::TestInfo::Run(void) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:2313:0</div><div>#14 0x00f93c76 testing::TestCase::Run(void) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:2416:0</div><div>#15 0x00f94079 testing::internal::UnitTestImpl::RunAllTests(void) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:4207:0</div><div>#16 0x00f82110 testing::internal::HandleSehExceptionsInMethodIfSupported<class testing::internal::UnitTestImpl,bool>(class testing::internal::UnitTestImpl *,bool ( testing::internal::UnitTestImpl::*)(void),char const *) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:2075:0</div><div>#17 0x00f93e82 testing::UnitTest::Run(void) c:\src\llvm\utils\unittest\googletest\src\gtest.cc:3841:0</div><div>#18 0x016fce32 _scrt_common_main_seh f:\dd\vctools\crt\vcstartup\src\startup\exe_common.inl:253:0</div><div>#19 0x76ac38f4 (C:\Windows\SYSTEM32\KERNEL32.DLL+0x138f4)</div><div>#20 0x76f95de3 (C:\Windows\SYSTEM32\ntdll.dll+0x65de3)</div><div>#21 0x76f95dae (C:\Windows\SYSTEM32\ntdll.dll+0x65dae)</div></div></div><div><br></div><div>I guess the way to work around this is to create some kind of wrapper around the Error that is trivially copyable etc, and pull the Error out on the other side of the future.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 29, 2016 at 11:10 PM, Lang Hames via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Douglas,<div><br></div><div>Hopefully this should be fixed by r280058 and r280059.</div><div><br></div><div>Cheers,</div><div>Lang.</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 29, 2016 at 7:40 PM, Lang Hames <span dir="ltr"><<a href="mailto:lhames@gmail.com" target="_blank">lhames@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Yung,<div><br></div><div>Bummer.</div><div><br></div><div>At first glance this looks like a failure to construct a future for a type with no default constructor - is that your read? Do you know if MSVC 2013's futures library supports that?</div><div><br></div><div>I'm on the road, but will be back in ~3 hours - when I get back I can try some workarounds for this. If that's too long for the builders, feel free to revert for now. </div><span class="m_-4389241388352016222HOEnZb"><font color="#888888"><div><br></div><div>- Lang.</div><div><br></div></font></span></div><div class="m_-4389241388352016222HOEnZb"><div class="m_-4389241388352016222h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 29, 2016 at 5:44 PM, Yung, Douglas <span dir="ltr"><<a href="mailto:douglas.yung@sony.com" target="_blank">douglas.yung@sony.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Lang,<br>
<br>
I believe your checkin caused the Windows build to break when compiling with Visual Studio 2013. When building your change, I am seeing the following errors:<br>
<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(294): error C2512: 'llvm::Expected<int>' : no appropriate default constructor available [C:\src\build\tools\lli\<a href="http://lli.vc" target="_blank">lli.vc</a><wbr>xproj]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(286) : while compiling class template member function 'std::_Associated_state<_Ty>::<wbr>_Associated_state(std::_Delete<wbr>r_base<_Ty> *)'<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(1481) : see reference to function template instantiation 'std::_Associated_state<_Ty>::<wbr>_Associated_state(std::_Delete<wbr>r_base<_Ty> *)' being compiled<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(1018) : see reference to class template instantiation 'std::_Associated_state<_Ty>' being compiled<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(1014) : while compiling class template member function 'llvm::Expected<int> &std::_State_manager<_Ty>::_Ge<wbr>t_value(void) const'<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(1132) : see reference to function template instantiation 'llvm::Expected<int> &std::_State_manager<_Ty>::_Ge<wbr>t_value(void) const' being compiled<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\future(1101) : see reference to class template instantiation 'std::_State_manager<_Ty>' being compiled<br>
with<br>
[<br>
_Ty=llvm::Expected<int><br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\utility(198) : see reference to class template instantiation 'std::future<llvm::Expected<in<wbr>t>>' being compiled<br>
C:\src\llvm\include\llvm/Suppo<wbr>rt/AlignOf.h(224) : see reference to class template instantiation 'std::pair<std::future<llvm::E<wbr>xpected<int>>,SequenceNumberT><wbr>' being compiled<br>
with<br>
[<br>
SequenceNumberT=uint16_t<br>
]<br>
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\type_traits(58<wbr>4) : see reference to class template instantiation 'llvm::detail::AlignerImpl<T1,<wbr>T2,T3,T4,T5,T6,T7,T8,T9,T10>' being compiled<br>
with<br>
[<br>
T1=std::pair<std::future<llvm:<wbr>:Expected<int>>,uint16_t><br>
, T2=char<br>
, T3=char<br>
, T4=char<br>
, T5=char<br>
, T6=char<br>
, T7=char<br>
, T8=char<br>
, T9=char<br>
, T10=char<br>
]<br>
C:\src\llvm\include\llvm/Suppo<wbr>rt/AlignOf.h(83) : see reference to class template instantiation 'std::is_abstract<T>' being compiled<br>
with<br>
[<br>
T=llvm::detail::AlignerImpl<st<wbr>d::pair<std::future<llvm::Expe<wbr>cted<int>>,uint16_t>,char,char<wbr>,char,char,char,char,char,char<wbr>,char><br>
]<br>
C:\src\llvm\include\llvm/Suppo<wbr>rt/AlignOf.h(253) : see reference to class template instantiation 'llvm::AlignOf<llvm::detail::A<wbr>lignerImpl<T1,T2,T3,T4,T5,T6,T<wbr>7,T8,T9,T10>>' being compiled<br>
Building Custom Rule C:/src/llvm/tools/clang/tools/<wbr>arcmt-test/CMakeLists.txt<br>
with<br>
[<br>
T1=std::pair<std::future<llvm:<wbr>:Expected<int>>,uint16_t><br>
, T2=char<br>
, T3=char<br>
, T4=char<br>
, T5=char<br>
, T6=char<br>
, T7=char<br>
, T8=char<br>
, T9=char<br>
, T10=char<br>
]<br>
C:\src\llvm\include\llvm/Suppo<wbr>rt/Error.h(831) : see reference to class template instantiation 'llvm::AlignedCharArrayUnion<s<wbr>td::pair<std::future<llvm::Exp<wbr>ected<int>>,SequenceNumberT>,c<wbr>har,char,char,char,char,char,c<wbr>har,char,char>' being compiled<br>
with<br>
[<br>
CMake does not need to re-run because C:\src\build\tools\clang\tools<wbr>\arcmt-test\CMakeFiles\generat<wbr>e.stamp is up-to-date.<br>
SequenceNumberT=uint16_t<br>
]<br>
c:\src\llvm\include\llvm\execu<wbr>tionengine\orc\RPCUtils.h(447) : see reference to class template instantiation 'llvm::Expected<std::pair<std:<wbr>:future<llvm::Expected<int>>,S<wbr>equenceNumberT>>' being compiled<br>
with<br>
[<br>
SequenceNumberT=uint16_t<br>
]<br>
C:\src\llvm\include\llvm/Execu<wbr>tionEngine/Orc/OrcRemoteTarget<wbr>Client.h(606) : see reference to function template instantiation 'llvm::Expected<int> llvm::orc::remote::RPC<llvm::o<wbr>rc::remote::RPCChannel,uint32_<wbr>t,uint16_t>::callSTHandling<ll<wbr>vm::orc::remote::OrcRemoteTarg<wbr>etRPCAPI::CallIntVoid,llvm::<wbr>orc::remote::<wbr>OrcRemoteTargetClient<llvm::or<wbr>c::remote::RPCChannel>::callIn<wbr>tVoid::<lambda_1e43ba3f76d8196<wbr>46569b43fe46505bc>,llvm::<wbr>JITTargetAddress>(ChannelT &,HandleFtor &,const llvm::JITTargetAddress &)' being compiled<br>
with<br>
[<br>
ChannelT=llvm::orc::remote::RP<wbr>CChannel<br>
, HandleFtor=llvm::orc::remote::<wbr>OrcRemoteTargetClient<llvm::or<wbr>c::remote::RPCChannel>::callIn<wbr>tVoid::<lambda_1e43ba3f76d8196<wbr>46569b43fe46505bc><br>
]<br>
C:\src\llvm\include\llvm/Execu<wbr>tionEngine/Orc/OrcRemoteTarget<wbr>Client.h(606) : see reference to function template instantiation 'llvm::Expected<int> llvm::orc::remote::RPC<llvm::o<wbr>rc::remote::RPCChannel,uint32_<wbr>t,uint16_t>::callSTHandling<ll<wbr>vm::orc::remote::OrcRemoteTarg<wbr>etRPCAPI::CallIntVoid,llvm::<wbr>orc::remote::<wbr>OrcRemoteTargetClient<llvm::or<wbr>c::remote::RPCChannel>::callIn<wbr>tVoid::<lambda_1e43ba3f76d8196<wbr>46569b43fe46505bc>,llvm::<wbr>JITTargetAddress>(ChannelT &,HandleFtor &,const llvm::JITTargetAddress &)' being compiled<br>
with<br>
[<br>
ChannelT=llvm::orc::remote::RP<wbr>CChannel<br>
, HandleFtor=llvm::orc::remote::<wbr>OrcRemoteTargetClient<llvm::or<wbr>c::remote::RPCChannel>::callIn<wbr>tVoid::<lambda_1e43ba3f76d8196<wbr>46569b43fe46505bc><br>
]<br>
C:\src\llvm\include\llvm/Execu<wbr>tionEngine/Orc/OrcRemoteTarget<wbr>Client.h(600) : while compiling class template member function 'llvm::Expected<int> llvm::orc::remote::OrcRemoteTa<wbr>rgetClient<llvm::orc::remote::<wbr>RPCChannel>::callIntVoid(llvm:<wbr>:JITTargetAddress)'<br>
C:\src\llvm\tools\lli\lli.cpp(<wbr>694) : see reference to function template instantiation 'llvm::Expected<int> llvm::orc::remote::OrcRemoteTa<wbr>rgetClient<llvm::orc::remote::<wbr>RPCChannel>::callIntVoid(llvm:<wbr>:JITTargetAddress)' being compiled<br>
C:\src\llvm\tools\lli\lli.cpp(<wbr>666) : see reference to class template instantiation 'llvm::orc::remote::OrcRemoteT<wbr>argetClient<llvm::orc::remote:<wbr>:RPCChannel>' being compiled<br>
OrcLazyJIT.cpp<br>
<br>
<br>
Can you take a look into this?<br>
<br>
Douglas Yung<br>
<div><div><br>
> -----Original Message-----<br>
> From: llvm-commits [mailto:<a href="mailto:llvm-commits-bounces@lists.llvm.org" target="_blank">llvm-commits-bounces@l<wbr>ists.llvm.org</a>] On<br>
> Behalf Of Lang Hames via llvm-commits<br>
> Sent: Monday, August 29, 2016 14:57<br>
> To: <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
> Subject: [llvm] r280016 - [ORC][RPC] Make the future type of an Orc RPC<br>
> call Error/Expected rather than<br>
><br>
> Author: lhames<br>
> Date: Mon Aug 29 16:56:30 2016<br>
> New Revision: 280016<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=280016&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=280016&view=rev</a><br>
> Log:<br>
> [ORC][RPC] Make the future type of an Orc RPC call Error/Expected<br>
> rather than Optional.<br>
><br>
> For void functions the return type of a nonblocking call changes from<br>
> Expected<future<Optional<bool><wbr>>> to Expected<future<Error>>, and for<br>
> functions returning T the return type changes from<br>
> Expected<future<Optional<T>>> to Expected<future<Expected<T>>>.<br>
><br>
> Inner results need to be checked (since the RPC connection may have<br>
> dropped out before a result came back) and Error/Expected provide<br>
> stronger checking requirements. It also allows us drop the crufty<br>
> 'optionalToError' function and just collapse Errors in the single-<br>
> threaded call primitives.<br>
><br>
><br>
> Modified:<br>
> llvm/trunk/include/llvm/Execu<wbr>tionEngine/Orc/RPCUtils.h<br>
> llvm/trunk/unittests/Executio<wbr>nEngine/Orc/RPCUtilsTest.cpp<br>
><br>
> Modified: llvm/trunk/include/llvm/Execut<wbr>ionEngine/Orc/RPCUtils.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> project/llvm/trunk/include/llv<wbr>m/ExecutionEngine/Orc/RPCUtils<wbr>.h?rev=2800<br>
> 16&r1=280015&r2=280016&view=di<wbr>ff<br>
> ==============================<wbr>==============================<wbr>===========<br>
> =======<br>
> --- llvm/trunk/include/llvm/Execut<wbr>ionEngine/Orc/RPCUtils.h (original)<br>
> +++ llvm/trunk/include/llvm/Execut<wbr>ionEngine/Orc/RPCUtils.h Mon Aug 29<br>
</div></div>> +++ 16:56:30 2016<br>
<div><div>> @@ -17,7 +17,6 @@<br>
> #include <map><br>
> #include <vector><br>
><br>
> -#include "llvm/ADT/Optional.h"<br>
> #include "llvm/ADT/STLExtras.h"<br>
> #include "llvm/ExecutionEngine/Orc/OrcE<wbr>rror.h"<br>
><br>
> @@ -61,6 +60,7 @@ public:<br>
> // partially specialized.<br>
> class RPCBase {<br>
> protected:<br>
> +<br>
> // RPC Function description type.<br>
> //<br>
> // This class provides the information and operations needed to<br>
> support the @@ -69,10 +69,7 @@ protected:<br>
> // betwen the two. Both specializations have the same interface:<br>
> //<br>
> // Id - The function's unique identifier.<br>
> - // OptionalReturn - The return type for asyncronous calls.<br>
> - // ErrorReturn - The return type for synchronous calls.<br>
> - // optionalToErrorReturn - Conversion from a valid OptionalReturn to<br>
> an<br>
> - // ErrorReturn.<br>
> + // ErrorReturn - The return type for blocking calls.<br>
> // readResult - Deserialize a result from a channel.<br>
> // abandon - Abandon a promised (asynchronous) result.<br>
> // respond - Retun a result on the channel.<br>
> @@ -91,32 +88,25 @@ protected:<br>
><br>
> static const FunctionIdT Id = FuncId;<br>
><br>
> - typedef Optional<RetT> OptionalReturn;<br>
> -<br>
> typedef Expected<RetT> ErrorReturn;<br>
><br>
> - static ErrorReturn optionalToErrorReturn(Optional<wbr>Return &&V) {<br>
> - assert(V && "Return value not available");<br>
> - return std::move(*V);<br>
> - }<br>
> -<br>
> template <typename ChannelT><br>
> - static Error readResult(ChannelT &C, std::promise<OptionalReturn><br>
> &P) {<br>
> + static Error readResult(ChannelT &C, std::promise<ErrorReturn> &P)<br>
</div></div>> + {<br>
<div><div>> RetT Val;<br>
> auto Err = deserialize(C, Val);<br>
> auto Err2 = endReceiveMessage(C);<br>
> Err = joinErrors(std::move(Err), std::move(Err2));<br>
> -<br>
> - if (Err) {<br>
> - P.set_value(OptionalReturn());<br>
> + if (Err)<br>
> return Err;<br>
> - }<br>
> +<br>
> P.set_value(std::move(Val));<br>
> return Error::success();<br>
> }<br>
><br>
> - static void abandon(std::promise<OptionalR<wbr>eturn> &P) {<br>
> - P.set_value(OptionalReturn());<br>
> + static void abandon(std::promise<ErrorRetu<wbr>rn> &P) {<br>
> + P.set_value(<br>
> + make_error<StringError>("RPC function call failed to return",<br>
> + inconvertibleErrorCode()));<br>
> }<br>
><br>
> template <typename ChannelT, typename SequenceNumberT> @@ -148,22<br>
> +138,20 @@ protected:<br>
><br>
> static const FunctionIdT Id = FuncId;<br>
><br>
> - typedef bool OptionalReturn;<br>
> typedef Error ErrorReturn;<br>
><br>
> - static ErrorReturn optionalToErrorReturn(Optional<wbr>Return &&V) {<br>
> - assert(V && "Return value not available");<br>
> - return Error::success();<br>
> - }<br>
> -<br>
> template <typename ChannelT><br>
> - static Error readResult(ChannelT &C, std::promise<OptionalReturn><br>
> &P) {<br>
> + static Error readResult(ChannelT &C, std::promise<ErrorReturn> &P)<br>
</div></div>> + {<br>
<div><div>> // Void functions don't have anything to deserialize, so we're<br>
> good.<br>
> - P.set_value(true);<br>
> + P.set_value(Error::success());<br>
> return endReceiveMessage(C);<br>
> }<br>
><br>
> - static void abandon(std::promise<OptionalR<wbr>eturn> &P) {<br>
> P.set_value(false); }<br>
> + static void abandon(std::promise<ErrorRetu<wbr>rn> &P) {<br>
> + P.set_value(<br>
> + make_error<StringError>("RPC function call failed to return",<br>
> + inconvertibleErrorCode()));<br>
> + }<br>
><br>
> template <typename ChannelT, typename SequenceNumberT><br>
> static Error respond(ChannelT &C, SequenceNumberT SeqNo, @@ -<br>
> 380,17 +368,17 @@ public:<br>
><br>
> /// Return type for asynchronous call primitives.<br>
> template <typename Func><br>
> - using AsyncCallResult = std::future<typename Func::OptionalReturn>;<br>
> + using AsyncCallResult = std::future<typename Func::ErrorReturn>;<br>
><br>
> /// Return type for asynchronous call-with-seq primitives.<br>
> template <typename Func><br>
> using AsyncCallWithSeqResult =<br>
> - std::pair<std::future<typename Func::OptionalReturn>,<br>
> SequenceNumberT>;<br>
> + std::pair<AsyncCallResult<Func<wbr>>, SequenceNumberT>;<br>
><br>
> /// Serialize Args... to channel C, but do not call C.send().<br>
> ///<br>
> /// Returns an error (on serialization failure) or a pair of:<br>
> - /// (1) A future Optional<T> (or future<bool> for void functions),<br>
> and<br>
> + /// (1) A future Expected<T> (or future<bool> for void functions),<br>
</div></div>> + and<br>
<div><div>> /// (2) A sequence number.<br>
> ///<br>
> /// This utility function is primarily used for single-threaded mode<br>
> support, @@ -401,7 +389,7 @@ public:<br>
> Expected<AsyncCallWithSeqResul<wbr>t<Func>><br>
> appendCallAsyncWithSeq(Channel<wbr>T &C, const ArgTs &... Args) {<br>
> auto SeqNo = SequenceNumberMgr.getSequenceN<wbr>umber();<br>
> - std::promise<typename Func::OptionalReturn> Promise;<br>
> + std::promise<typename Func::ErrorReturn> Promise;<br>
> auto Result = Promise.get_future();<br>
> OutstandingResults[SeqNo] =<br>
> createOutstandingResult<Func>(<wbr>std::move(Promise));<br>
> @@ -431,7 +419,7 @@ public:<br>
><br>
> /// Serialize Args... to channel C, but do not call send.<br>
> /// Returns an error if serialization fails, otherwise returns a<br>
> - /// std::future<Optional<T>> (or a future<bool> for void functions).<br>
> + /// std::future<Expected<T>> (or a future<bool> for void functions).<br>
> template <typename Func, typename... ArgTs><br>
> Expected<AsyncCallResult<Func><wbr>> appendCallAsync(ChannelT &C,<br>
> const ArgTs &...<br>
> Args) { @@ -460,7 +448,7 @@ public:<br>
> auto &ResultAndSeqNo = *ResultAndSeqNoOrErr;<br>
> if (auto Err = waitForResult(C, ResultAndSeqNo.second,<br>
> HandleOther))<br>
> return std::move(Err);<br>
> - return Func::optionalToErrorReturn(Re<wbr>sultAndSeqNo.first.get());<br>
> + return ResultAndSeqNo.first.get();<br>
> } else<br>
> return ResultAndSeqNoOrErr.takeError(<wbr>);<br>
> }<br>
> @@ -656,7 +644,7 @@ private:<br>
> class OutstandingResultImpl : public OutstandingResult {<br>
> private:<br>
> public:<br>
> - OutstandingResultImpl(std::pro<wbr>mise<typename Func::OptionalReturn><br>
> &&P)<br>
> + OutstandingResultImpl(std::pro<wbr>mise<typename Func::ErrorReturn><br>
> &&P)<br>
> : P(std::move(P)) {}<br>
><br>
> Error readResult(ChannelT &C) override { return<br>
> Func::readResult(C, P); } @@ -664,13 +652,13 @@ private:<br>
> void abandon() override { Func::abandon(P); }<br>
><br>
> private:<br>
> - std::promise<typename Func::OptionalReturn> P;<br>
> + std::promise<typename Func::ErrorReturn> P;<br>
> };<br>
><br>
> // Create an outstanding result for the given function.<br>
> template <typename Func><br>
> std::unique_ptr<OutstandingRes<wbr>ult><br>
> - createOutstandingResult(std::p<wbr>romise<typename Func::OptionalReturn><br>
> &&P) {<br>
> + createOutstandingResult(std::p<wbr>romise<typename Func::ErrorReturn><br>
> &&P)<br>
</div></div>> + {<br>
<span>> return<br>
> llvm::make_unique<OutstandingR<wbr>esultImpl<Func>>(std::move(P))<wbr>;<br>
> }<br>
><br>
><br>
> Modified: llvm/trunk/unittests/Execution<wbr>Engine/Orc/RPCUtilsTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> project/llvm/trunk/unittests/E<wbr>xecutionEngine/Orc/RPCUtilsTes<wbr>t.cpp?rev=2<br>
> 80016&r1=280015&r2=280016&view<wbr>=diff<br>
> ==============================<wbr>==============================<wbr>===========<br>
> =======<br>
> --- llvm/trunk/unittests/Execution<wbr>Engine/Orc/RPCUtilsTest.cpp<br>
> (original)<br>
> +++ llvm/trunk/unittests/Execution<wbr>Engine/Orc/RPCUtilsTest.cpp Mon Aug<br>
> 29<br>
</span>> +++ 16:56:30 2016<br>
<div><div>> @@ -102,8 +102,8 @@ TEST_F(DummyRPC, TestAsyncVoidBool) {<br>
> }<br>
><br>
> // Verify that the function returned ok.<br>
> - auto Val = ResOrErr->first.get();<br>
> - EXPECT_TRUE(Val) << "Remote void function failed to execute.";<br>
> + auto Err = ResOrErr->first.get();<br>
> + EXPECT_TRUE(!!Err) << "Remote void function failed to execute.";<br>
> }<br>
><br>
> TEST_F(DummyRPC, TestAsyncIntInt) {<br>
> @@ -179,8 +179,8 @@ TEST_F(DummyRPC, TestSerialization) {<br>
> }<br>
><br>
> // Verify that the function returned ok.<br>
> - auto Val = ResOrErr->first.get();<br>
> - EXPECT_TRUE(Val) << "Remote void function failed to execute.";<br>
> + auto Err = ResOrErr->first.get();<br>
> + EXPECT_TRUE(!!Err) << "Remote void function failed to execute.";<br>
> }<br>
><br>
> // Test the synchronous call API.<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</div></div><br>______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br></div>