summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-04-26 19:44:20 +0000
committerChris Lattner <sabre@nondot.org>2009-04-26 19:44:20 +0000
commit0ba740892eb995f7d1eda0ee4bad9c2073d383a1 (patch)
tree162cb940a0f950dbdb21385041bbc3ef918870f6
parent1c4a175aefcdcf38230baa37dade6bbad3d53240 (diff)
downloadbcm5719-llvm-0ba740892eb995f7d1eda0ee4bad9c2073d383a1.tar.gz
bcm5719-llvm-0ba740892eb995f7d1eda0ee4bad9c2073d383a1.zip
revert an incorrect patch. This causes crashes all over the place on a
64-bit build. llvm-svn: 70147
-rw-r--r--llvm/include/llvm/ADT/PointerIntPair.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/llvm/include/llvm/ADT/PointerIntPair.h b/llvm/include/llvm/ADT/PointerIntPair.h
index e987b104ebe..43a083d21ec 100644
--- a/llvm/include/llvm/ADT/PointerIntPair.h
+++ b/llvm/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) {}
OpenPOWER on IntegriCloud