[llvm] r257486 - [Orc] Take another shot at working around the GCC 4.7 ICE in

[Lang Hames via llvm-commits]

Author: lhames
Date: Tue Jan 12 11:04:12 2016
New Revision: 257486

URL: http://llvm.org/viewvc/llvm-project?rev=257486&view=rev
Log:
[Orc] Take another shot at working around the GCC 4.7 ICE in
http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/27486


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=257486&r1=257485&r2=257486&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h Tue Jan 12 11:04:12 2016
@@ -102,47 +102,44 @@ public:
                                 uint32_t RWDataAlign) override {
       Unmapped.push_back(ObjectAllocs());
 
-//      DEBUG(dbgs() << "Allocator " << Id << " reserved:\n");
+      DEBUG(dbgs() << "Allocator " << Id << " reserved:\n");
 
       if (CodeSize != 0) {
-        if (std::error_code EC = Client.reserveMem(
-                Unmapped.back().RemoteCodeAddr, Id, CodeSize, CodeAlign)) {
-          (void)EC;
-          // FIXME; Add error to poll.
-          llvm_unreachable("Failed reserving remote memory.");
-        }
-//         DEBUG(dbgs() << "  code: "
-//                      << format("0x%016x", Unmapped.back().RemoteCodeAddr)
-//                      << " (" << CodeSize << " bytes, alignment " << CodeAlign
-//                      << ")\n");
+        std::error_code EC = Client.reserveMem(
+          Unmapped.back().RemoteCodeAddr, Id, CodeSize, CodeAlign);
+        // FIXME; Add error to poll.
+        assert(!EC && "Failed reserving remote memory.");
+        (void)EC;
+        DEBUG(dbgs() << "  code: "
+                     << format("0x%016x", Unmapped.back().RemoteCodeAddr)
+                     << " (" << CodeSize << " bytes, alignment " << CodeAlign
+                     << ")\n");
       }
 
       if (RODataSize != 0) {
-        if (std::error_code EC =
+        std::error_code EC =
                 Client.reserveMem(Unmapped.back().RemoteRODataAddr, Id,
-                                  RODataSize, RODataAlign)) {
-          (void)EC;
-          // FIXME; Add error to poll.
-          llvm_unreachable("Failed reserving remote memory.");
-        }
-//         DEBUG(dbgs() << "  ro-data: "
-//                      << format("0x%016x", Unmapped.back().RemoteRODataAddr)
-//                      << " (" << RODataSize << " bytes, alignment "
-//                      << RODataAlign << ")\n");
+                                  RODataSize, RODataAlign);
+        // FIXME; Add error to poll.
+        assert(!EC && "Failed reserving remote memory.");
+        (void)EC;
+        DEBUG(dbgs() << "  ro-data: "
+                     << format("0x%016x", Unmapped.back().RemoteRODataAddr)
+                     << " (" << RODataSize << " bytes, alignment "
+                     << RODataAlign << ")\n");
       }
 
       if (RWDataSize != 0) {
-        if (std::error_code EC =
-                Client.reserveMem(Unmapped.back().RemoteRWDataAddr, Id,
-                                  RWDataSize, RWDataAlign)) {
-          (void)EC;
-          // FIXME; Add error to poll.
-          llvm_unreachable("Failed reserving remote memory.");
-        }
-//         DEBUG(dbgs() << "  rw-data: "
-//                      << format("0x%016x", Unmapped.back().RemoteRWDataAddr)
-//                      << " (" << RWDataSize << " bytes, alignment "
-//                      << RWDataAlign << ")\n");
+        std::error_code EC =
+          Client.reserveMem(Unmapped.back().RemoteRWDataAddr, Id,
+                            RWDataSize, RWDataAlign);
+        // FIXME; Add error to poll.
+        assert(!EC && "Failed reserving remote memory.");
+        (void)EC;
+        DEBUG(dbgs() << "  rw-data: "
+                     << format("0x%016x", Unmapped.back().RemoteRWDataAddr)
+                     << " (" << RWDataSize << " bytes, alignment "
+                     << RWDataAlign << ")\n");
       }
     }