[lld] r351488 - [WebAssembly] Fix windows compiler warning by using explicit 64bit shift. NFC.

[Sam Clegg via llvm-commits]

Author: sbc
Date: Thu Jan 17 14:09:09 2019
New Revision: 351488

URL: http://llvm.org/viewvc/llvm-project?rev=351488&view=rev
Log:
[WebAssembly] Fix windows compiler warning by using explicit 64bit shift. NFC.

Differential Revision: https://reviews.llvm.org/D56874

Modified:
    lld/trunk/wasm/OutputSegment.h
    lld/trunk/wasm/Writer.cpp

Modified: lld/trunk/wasm/OutputSegment.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/OutputSegment.h?rev=351488&r1=351487&r2=351488&view=diff
==============================================================================
--- lld/trunk/wasm/OutputSegment.h (original)
+++ lld/trunk/wasm/OutputSegment.h Thu Jan 17 14:09:09 2019
@@ -26,7 +26,7 @@ public:
   void addInputSegment(InputSegment *InSeg) {
     Alignment = std::max(Alignment, InSeg->getAlignment());
     InputSegments.push_back(InSeg);
-    Size = llvm::alignTo(Size, 1 << InSeg->getAlignment());
+    Size = llvm::alignTo(Size, 1ULL << InSeg->getAlignment());
     InSeg->OutputSeg = this;
     InSeg->OutputSegmentOffset = Size;
     Size += InSeg->getSize();

Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=351488&r1=351487&r2=351488&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Thu Jan 17 14:09:09 2019
@@ -733,7 +733,7 @@ void Writer::layoutMemory() {
   MemAlign = 0;
   for (OutputSegment *Seg : Segments) {
     MemAlign = std::max(MemAlign, Seg->Alignment);
-    MemoryPtr = alignTo(MemoryPtr, 1 << Seg->Alignment);
+    MemoryPtr = alignTo(MemoryPtr, 1ULL << Seg->Alignment);
     Seg->StartVA = MemoryPtr;
     log(formatv("mem: {0,-15} offset={1,-8} size={2,-8} align={3}", Seg->Name,
                 MemoryPtr, Seg->Size, Seg->Alignment));