Skip to content

Commit 77cad0b

Browse files
committed
Try to fix the assert in Alignment::alignAddr to work on 32-bit
Hopefully fixing the AlignmentDeathTest.AlignAddr failures (e.g. at http://lab.llvm.org:8011/builders/clang-cmake-armv7-quick/builds/10925) llvm-svn: 375090
1 parent b6534b2 commit 77cad0b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

llvm/include/llvm/Support/Alignment.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ inline uint64_t alignTo(uint64_t Size, MaybeAlign A) {
183183
/// Aligns `Addr` to `Alignment` bytes, rounding up.
184184
inline uintptr_t alignAddr(const void *Addr, Align Alignment) {
185185
uintptr_t ArithAddr = reinterpret_cast<uintptr_t>(Addr);
186-
assert(ArithAddr + Alignment.value() - 1 >= ArithAddr && "Overflow");
186+
assert(static_cast<uintptr_t>(ArithAddr + Alignment.value() - 1) >=
187+
ArithAddr && "Overflow");
187188
return alignTo(ArithAddr, Alignment);
188189
}
189190

0 commit comments

Comments
 (0)