commit d5f2093c02f8b980668dc0ddd8847a7b0b5d03ad
author Simon Pilgrim <llvm-dev@redking.me.uk> Fri Oct 18 09:59:31 2019 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Fri Oct 18 09:59:31 2019 +0000
tree 4bea0b285f45ae55a871db972a62d691534b7e2b
parent eaef0d10bd32da2784113cc766fc205be2da5c11

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

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

lib/Object/MachOUniversal.cpp

diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp
index 3e5be91..a178ecd 100644
--- a/lib/Object/MachOUniversal.cpp
+++ b/lib/Object/MachOUniversal.cpp
@@ -164,7 +164,7 @@
                            ") (maximum 2^" + Twine(MaxSectionAlignment) + ")");
       return;
     }
-    if(A.getOffset() % (1 << A.getAlign()) != 0){
+    if(A.getOffset() % (1ull << A.getAlign()) != 0){
       Err = malformedError("offset: " + Twine(A.getOffset()) +
         " for cputype (" + Twine(A.getCPUType()) + ") cpusubtype (" +
         Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) +

tools/llvm-objdump/MachODump.cpp

diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 284f9b2..e4684d0 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -2199,7 +2199,7 @@
     outs() << "    offset " << OFA.getOffset();
     if (OFA.getOffset() > size)
       outs() << " (past end of file)";
-    if (OFA.getOffset() % (1 << OFA.getAlign()) != 0)
+    if (OFA.getOffset() % (1ull << OFA.getAlign()) != 0)
       outs() << " (not aligned on it's alignment (2^" << OFA.getAlign() << ")";
     outs() << "\n";
     outs() << "    size " << OFA.getSize();