maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 257486
This commit is contained in:
Lang Hames 2016-01-12 17:04:12 +00:00
parent 6f4000e763
commit 1b39fcc708
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
View File

@ -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");
}
}