From 05e78944a194041bae4f719765c03c31b65f0062 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 12 Jan 2016 19:01:49 +0000 Subject: [PATCH] [ORC] More cleanup, partially aimed at working around GCC ICE. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@257501 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h index 97318bcfa03..d23b600aa51 100644 --- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -726,14 +726,10 @@ private: if (ExistingError) return ExistingError; - if (auto EC = call(Channel, Id, Size, Align)) + if (std::error_code EC = call(Channel, Id, Size, Align)) return EC; - if (std::error_code EC = - expect(Channel, readArgs(RemoteAddr))) - return EC; - - return std::error_code(); + return expect(Channel, readArgs(RemoteAddr)); } std::error_code setProtections(ResourceIdMgr::ResourceId Id, -- 2.34.1