commit 7de9a5ce60d7bad9b4922dda78143c57ee1659c6
author Simon Pilgrim <llvm-dev@redking.me.uk> Fri Oct 04 11:24:35 2019 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Fri Oct 04 11:24:35 2019 +0000
tree f644c4e1f95ff68401157abfcb30728fdcd970a6
parent 4682b9c46b27ce8e550923e25ae26d5888cf70a8

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

llvm-svn: 373729

llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h

diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
index 6d44745..b531127 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h
@@ -206,7 +206,7 @@
   }
 
   /// Get the alignment for this content.
-  uint64_t getAlignment() const { return 1 << P2Align; }
+  uint64_t getAlignment() const { return 1ull << P2Align; }
 
   /// Get the alignment offset for this content.
   uint64_t getAlignmentOffset() const { return AlignmentOffset; }

llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp

diff --git a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
index 57fbc69..7366f53 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
@@ -312,7 +312,7 @@
                                           Twine(KV.first));
         NSym.GraphSymbol = &G->addCommonSymbol(
             *NSym.Name, NSym.S, getCommonSection(), NSym.Value, 0,
-            1U << MachO::GET_COMM_ALIGN(NSym.Desc),
+            1ull << MachO::GET_COMM_ALIGN(NSym.Desc),
             NSym.Desc & MachO::N_NO_DEAD_STRIP);
       } else {
         if (!NSym.Name)