summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2019-04-20 18:30:16 +0000
committerLang Hames <lhames@gmail.com>2019-04-20 18:30:16 +0000
commitdfc3a4f6ffde04f0977c5a76877ce2054a13dde8 (patch)
treed609fe248be8aa1dd3809db44cbc9721f0e7bb30 /llvm/lib/ExecutionEngine
parentd9a7a7d3d004ed62ded9b7270c242e61d9ea34f3 (diff)
downloadbcm5719-llvm-dfc3a4f6ffde04f0977c5a76877ce2054a13dde8.tar.gz
bcm5719-llvm-dfc3a4f6ffde04f0977c5a76877ce2054a13dde8.zip
[JITLink] Silence some MSVC implicit cast warnings.
llvm-svn: 358824
Diffstat (limited to 'llvm/lib/ExecutionEngine')
-rw-r--r--llvm/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp
index fd058fa3116..0e1dd236dc8 100644
--- a/llvm/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/JITLink_MachO_x86_64.cpp
@@ -227,7 +227,7 @@ private:
AtomToFix = &*AtomToFixOrErr;
}
- if (FixupAddress + (1 << RI.r_length) >
+ if (FixupAddress + static_cast<JITTargetAddress>(1 << RI.r_length) >
AtomToFix->getAddress() + AtomToFix->getContent().size())
return make_error<JITLinkError>(
"Relocation content extends past end of fixup atom");
@@ -290,7 +290,8 @@ private:
case PCRel32Minus1Anon:
case PCRel32Minus2Anon:
case PCRel32Minus4Anon: {
- JITTargetAddress Delta = 1 << (*Kind - PCRel32Minus1Anon);
+ JITTargetAddress Delta =
+ static_cast<JITTargetAddress>(1 << (*Kind - PCRel32Minus1Anon));
JITTargetAddress TargetAddress =
FixupAddress + 4 + Delta + *(const ulittle32_t *)FixupContent;
if (auto TargetAtomOrErr = G.findAtomByAddress(TargetAddress))
OpenPOWER on IntegriCloud