[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

1 files changed, 3 insertions, 2 deletions

diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
index 4ba41e3d2c9..14df9f9f5c8 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) {