From da40d4e4e1bfa705dbf59ebce097ed34b0e46dfc Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Fri, 18 Oct 2019 09:59:31 +0000 Subject: [PATCH] Fix MSVC "result of 32-bit shift implicitly converted to 64 bits" warnings. NFCI. llvm-svn: 375213 --- llvm/lib/Object/MachOUniversal.cpp | 2 +- llvm/tools/llvm-objdump/MachODump.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp index 3e5be913c25f..a178ecde949e 100644 --- a/llvm/lib/Object/MachOUniversal.cpp +++ b/llvm/lib/Object/MachOUniversal.cpp @@ -164,7 +164,7 @@ MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, Error &Err) ") (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) + diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 284f9b2a7af7..e4684d0f1601 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -2199,7 +2199,7 @@ static void printMachOUniversalHeaders(const object::MachOUniversalBinary *UB, 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();