diff options
author | Chris Lattner <sabre@nondot.org> | 2009-04-26 19:44:20 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-04-26 19:44:20 +0000 |
commit | 1e8db00e3b244a9a6b4b4a22adaa5618fafc37df (patch) | |
tree | 9c93e7b6daa166bd676e68022e6881ef08ad7e4e /include/llvm/ADT/PointerIntPair.h | |
parent | 610cb31ac9853540416a87125ff94783de4a4231 (diff) | |
download | llvm-1e8db00e3b244a9a6b4b4a22adaa5618fafc37df.tar.gz llvm-1e8db00e3b244a9a6b4b4a22adaa5618fafc37df.tar.bz2 llvm-1e8db00e3b244a9a6b4b4a22adaa5618fafc37df.tar.xz |
revert an incorrect patch. This causes crashes all over the place on a
64-bit build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70147 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/ADT/PointerIntPair.h')
-rw-r--r-- | include/llvm/ADT/PointerIntPair.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h index e987b104eb..43a083d21e 100644 --- a/include/llvm/ADT/PointerIntPair.h +++ b/include/llvm/ADT/PointerIntPair.h @@ -42,18 +42,16 @@ class PointerIntPair { intptr_t Value; enum { /// PointerBitMask - The bits that come from the pointer. - PointerBitMask = - ~(unsigned)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1), - + PointerBitMask = ~(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1), /// IntShift - The number of low bits that we reserve for other uses, and /// keep zero. - IntShift = (unsigned)PtrTraits::NumLowBitsAvailable-IntBits, + IntShift = PtrTraits::NumLowBitsAvailable-IntBits, /// IntMask - This is the unshifted mask for valid bits of the int type. - IntMask = (unsigned)(((intptr_t)1 << IntBits)-1), + IntMask = ((intptr_t)1 << IntBits)-1, // ShiftedIntMask - This is the bits for the integer shifted in place. - ShiftedIntMask = (unsigned)(IntMask << IntShift) + ShiftedIntMask = IntMask << IntShift }; public: PointerIntPair() : Value(0) {} |