From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Tue, 23 Apr 2019 11:16:16 +0000 (+0000)
Subject: Fix MSVC "32-bit shift implicitly converted to 64 bits" warning. NFCI.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2429cc586ef907dd4d3bb96e85481225e52b527f;p=llvm

Fix MSVC "32-bit shift implicitly converted to 64 bits" warning. NFCI.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358970 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp b/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
index 3f12bf4b89f..75725dbc526 100644
--- a/lib/ExecutionEngine/JITLink/MachO_x86_64.cpp
+++ b/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))