From ae643ee2d1e637643b365e077ff0def93cf3e0b2 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Fri, 29 Apr 2016 21:29:48 +0000 Subject: [PATCH] [Orc] Make sure we don't drop the internal error in OrcRemoteTargetClient when the constructor fails, as this would lead to an 'unchecked error' crash. llvm-svn: 268111 --- llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h index 4ba41e3..14df9f9 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -693,8 +693,9 @@ private: std::tie(RemoteTargetTriple, RemotePointerSize, RemotePageSize, RemoteTrampolineSize, RemoteIndirectStubSize) = *RIOrErr; Err = Error::success(); - } else - Err = RIOrErr.takeError(); + } else { + Err = joinErrors(RIOrErr.takeError(), std::move(ExistingError)); + } } Error deregisterEHFrames(TargetAddress Addr, uint32_t Size) { -- 2.7.4