summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2019-04-23 11:16:16 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2019-04-23 11:16:16 +0000
commitddd225d1a92e7bf28a3185b269fa5911ea89123e (patch)
tree08f69ab07bc0ab205a9a5992adfb033692b55c2f /llvm/lib/ExecutionEngine
parente7a68fd93e822ebb8069cb8f675b369ccb879721 (diff)
downloadbcm5719-llvm-ddd225d1a92e7bf28a3185b269fa5911ea89123e.tar.gz
bcm5719-llvm-ddd225d1a92e7bf28a3185b269fa5911ea89123e.zip
Fix MSVC "32-bit shift implicitly converted to 64 bits" warning. NFCI.
llvm-svn: 358970
Diffstat (limited to 'llvm/lib/ExecutionEngine')
-rw-r--r--llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
index 3f12bf4b89f..75725dbc526 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
@@ -235,7 +235,7 @@ private:
AtomToFix = &*AtomToFixOrErr;
}
- if (FixupAddress + static_cast<JITTargetAddress>(1 << RI.r_length) >
+ if (FixupAddress + static_cast<JITTargetAddress>(1ULL << RI.r_length) >
AtomToFix->getAddress() + AtomToFix->getContent().size())
return make_error<JITLinkError>(
"Relocation content extends past end of fixup atom");
@@ -299,7 +299,7 @@ private:
case PCRel32Minus2Anon:
case PCRel32Minus4Anon: {
JITTargetAddress Delta =
- static_cast<JITTargetAddress>(1 << (*Kind - PCRel32Minus1Anon));
+ static_cast<JITTargetAddress>(1ULL << (*Kind - PCRel32Minus1Anon));
JITTargetAddress TargetAddress =
FixupAddress + 4 + Delta + *(const ulittle32_t *)FixupContent;
if (auto TargetAtomOrErr = G.findAtomByAddress(TargetAddress))
OpenPOWER on IntegriCloud