[ORC] More cleanup, partially aimed at working around GCC ICE.
authorLang Hames <lhames@gmail.com>
Tue, 12 Jan 2016 19:01:49 +0000 (19:01 +0000)
committerLang Hames <lhames@gmail.com>
Tue, 12 Jan 2016 19:01:49 +0000 (19:01 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@257501 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h

index 97318bc..d23b600 100644 (file)
@@ -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,