[ORC] More cleanup, partially aimed at working around GCC ICE.

[oota-llvm.git] / include / llvm / ExecutionEngine / Orc / OrcRemoteTargetClient.h

diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
index 97318bcfa0357a9311005304f81455a4953bcc04..d23b600aa51fcd81f7a7272a1886af362f35fca0 100644 (file)
--- 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<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,