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

[Lang Hames via llvm-commits]

Author: lhames
Date: Tue Jan 12 13:01:49 2016
New Revision: 257501

URL: http://llvm.org/viewvc/llvm-project?rev=257501&view=rev
Log:
[ORC] More cleanup, partially aimed at working around GCC ICE.

Modified:
    llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h

Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h?rev=257501&r1=257500&r2=257501&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h Tue Jan 12 13:01:49 2016
@@ -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,