diff options
| author | Lang Hames <lhames@gmail.com> | 2016-01-12 19:01:49 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2016-01-12 19:01:49 +0000 |
| commit | 963a6342d421fa3f32ee52ca392dc37e843ec2e7 (patch) | |
| tree | 6fbac9352f246f61779b5bfef799f77a174ce4e2 | |
| parent | 046c1d6355dcddfa70f2df669c0186f716f5af28 (diff) | |
| download | bcm5719-llvm-963a6342d421fa3f32ee52ca392dc37e843ec2e7.tar.gz bcm5719-llvm-963a6342d421fa3f32ee52ca392dc37e843ec2e7.zip | |
[ORC] More cleanup, partially aimed at working around GCC ICE.
llvm-svn: 257501
| -rw-r--r-- | llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h index 97318bcfa03..d23b600aa51 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -726,14 +726,10 @@ private: if (ExistingError) return ExistingError; - if (auto EC = call<ReserveMem>(Channel, Id, Size, Align)) + if (std::error_code EC = call<ReserveMem>(Channel, Id, Size, Align)) return EC; - if (std::error_code EC = - expect<ReserveMemResponse>(Channel, readArgs(RemoteAddr))) - return EC; - - return std::error_code(); + return expect<ReserveMemResponse>(Channel, readArgs(RemoteAddr)); } std::error_code setProtections(ResourceIdMgr::ResourceId Id, |
