From e8427656663d1ad48f706864373201b5093249fb Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Fri, 13 Nov 2020 20:09:38 +1100 Subject: [PATCH] [ORC] Make a narrowing conversion explicit. --- .../llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h index f63dcd0f34717..b498661021ae3 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h @@ -59,7 +59,7 @@ class OrcRPCTPCJITLinkMemoryManager : public jitlink::JITLinkMemoryManager { auto I = HostAllocs.find(Seg); assert(I != HostAllocs.end() && "No host allocation for segment"); auto &HA = I->second; - return {HA.Mem.get(), HA.Size}; + return {HA.Mem.get(), static_cast(HA.Size)}; } JITTargetAddress getTargetMemory(ProtectionFlags Seg) override { @@ -153,6 +153,9 @@ class OrcRPCTPCJITLinkMemoryManager : public jitlink::JITLinkMemoryManager { HostAllocMap HostAllocs; for (auto &KV : Request) { + assert(KV.second.getContentSize() <= std::numeric_limits::max() && + "Content size is out-of-range for host"); + RMR.push_back({orcrpctpc::toWireProtectionFlags( static_cast(KV.first)), KV.second.getContentSize() + KV.second.getZeroFillSize(),