From: Chris Lattner <sabre@nondot.org>
Date: Sun, 26 Apr 2009 19:44:20 +0000 (+0000)
Subject: revert an incorrect patch.  This causes crashes all over the place on a
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1e8db00e3b244a9a6b4b4a22adaa5618fafc37df;p=oota-llvm.git

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
---

diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h
index e987b104ebe..43a083d21ec 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) {}