From dbe68adeb2d329ff3b3b522a80aab13af10c9460 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Thu, 13 Nov 2014 13:55:13 +0000 Subject: [PATCH] Fixing -Wtype-limits warnings with the asserts (the expression would always evaluate to true). Also fixing a -Wcast-qual warning, where the cast expression isn't required. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221888 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/StreamingMemoryObject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Support/StreamingMemoryObject.cpp b/lib/Support/StreamingMemoryObject.cpp index f0eb83153e0..68beeef4dc7 100644 --- a/lib/Support/StreamingMemoryObject.cpp +++ b/lib/Support/StreamingMemoryObject.cpp @@ -59,9 +59,9 @@ uint64_t RawMemoryObject::readBytes(uint8_t *Buf, uint64_t Size, if (End > BufferSize) End = BufferSize; + assert(static_cast(End - Address) >= 0); Size = End - Address; - assert(Size >= 0); - memcpy(Buf, (uint8_t *)(Address + FirstChar), Size); + memcpy(Buf, Address + FirstChar, Size); return Size; } @@ -96,8 +96,8 @@ uint64_t StreamingMemoryObject::readBytes(uint8_t *Buf, uint64_t Size, uint64_t End = Address + Size; if (End > BytesRead) End = BytesRead; + assert(static_cast(End - Address) >= 0); Size = End - Address; - assert(Size >= 0); memcpy(Buf, &Bytes[Address + BytesSkipped], Size); return Size; } -- 2.34.1