[llvm-commits] [llvm] r70147 - /llvm/trunk/include/llvm/ADT/PointerIntPair.h

[Chris Lattner]

Author: lattner
Date: Sun Apr 26 14:44:20 2009
New Revision: 70147

URL: http://llvm.org/viewvc/llvm-project?rev=70147&view=rev
Log:
revert an incorrect patch.  This causes crashes all over the place on a
64-bit build.

Modified:
    llvm/trunk/include/llvm/ADT/PointerIntPair.h

Modified: llvm/trunk/include/llvm/ADT/PointerIntPair.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerIntPair.h?rev=70147&r1=70146&r2=70147&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ADT/PointerIntPair.h (original)
+++ llvm/trunk/include/llvm/ADT/PointerIntPair.h Sun Apr 26 14:44:20 2009
@@ -42,18 +42,16 @@
   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) {}