From: Ulrich Weigand Date: Thu, 1 Dec 2016 18:00:50 +0000 (+0000) Subject: [SystemZ] Fix fallout from r288374 X-Git-Tag: llvmorg-4.0.0-rc1~3249 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d36b31d03f75a648a51026981dd2c36f60541c01;p=platform%2Fupstream%2Fllvm.git [SystemZ] Fix fallout from r288374 Avoid undefined behavior due to too-large shift count. llvm-svn: 288391 --- diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp index 1f3cdde..9192448 100644 --- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp +++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmBackend.cpp @@ -101,7 +101,8 @@ void SystemZMCAsmBackend::applyFixup(const MCFixup &Fixup, char *Data, // Big-endian insertion of Size bytes. Value = extractBitsForFixup(Kind, Value); - Value &= ((uint64_t)1 << BitSize) - 1; + if (BitSize < 64) + Value &= ((uint64_t)1 << BitSize) - 1; unsigned ShiftValue = (Size * 8) - 8; for (unsigned I = 0; I != Size; ++I) { Data[Offset + I] |= uint8_t(Value >> ShiftValue);