X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=include%2Fllvm%2FExecutionEngine%2FOrc%2FOrcRemoteTargetClient.h;fp=include%2Fllvm%2FExecutionEngine%2FOrc%2FOrcRemoteTargetClient.h;h=d23b600aa51fcd81f7a7272a1886af362f35fca0;hp=97318bcfa0357a9311005304f81455a4953bcc04;hb=05e78944a194041bae4f719765c03c31b65f0062;hpb=70b3436457c4cb0d52efd472b8f9dea52eee7180

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<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,