Skip to content

Commit

Permalink
Switching -1ULL to UINT64_MAX to fix MSVC warnings. Patch thanks to P…
Browse files Browse the repository at this point in the history
…eng Cheng!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176197 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
AaronBallman committed Feb 27, 2013
1 parent 6668a42 commit 8660057
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions include/llvm/ADT/APInt.h
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ class APInt {
/// @returns the all-ones value for an APInt of the specified bit-width.
/// @brief Get the all-ones value.
static APInt getAllOnesValue(unsigned numBits) {
return APInt(numBits, -1ULL, true);
return APInt(numBits, UINT64_MAX, true);
}

/// @returns the '0' value for an APInt of the specified bit-width.
Expand Down Expand Up @@ -498,10 +498,10 @@ class APInt {
if (loBitsSet == 0)
return APInt(numBits, 0);
if (loBitsSet == APINT_BITS_PER_WORD)
return APInt(numBits, -1ULL);
return APInt(numBits, UINT64_MAX);
// For small values, return quickly.
if (loBitsSet <= APINT_BITS_PER_WORD)
return APInt(numBits, -1ULL >> (APINT_BITS_PER_WORD - loBitsSet));
return APInt(numBits, UINT64_MAX >> (APINT_BITS_PER_WORD - loBitsSet));
return getAllOnesValue(numBits).lshr(numBits - loBitsSet);
}

Expand Down Expand Up @@ -1091,11 +1091,11 @@ class APInt {
/// @brief Set every bit to 1.
void setAllBits() {
if (isSingleWord())
VAL = -1ULL;
VAL = UINT64_MAX;
else {
// Set all the bits in all the words.
for (unsigned i = 0; i < getNumWords(); ++i)
pVal[i] = -1ULL;
pVal[i] = UINT64_MAX;
}
// Clear the unused ones
clearUnusedBits();
Expand All @@ -1120,10 +1120,10 @@ class APInt {
/// @brief Toggle every bit to its opposite value.
void flipAllBits() {
if (isSingleWord())
VAL ^= -1ULL;
VAL ^= UINT64_MAX;
else {
for (unsigned i = 0; i < getNumWords(); ++i)
pVal[i] ^= -1ULL;
pVal[i] ^= UINT64_MAX;
}
clearUnusedBits();
}
Expand Down

0 comments on commit 8660057

Please sign in to comment.