Move the conversion to intptr_t to a separate statement. This

avoids GCC's warning even on 64-bit hosts.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60706 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h
index 9d34b44..176f670 100644 (file)
--- a/include/llvm/ADT/PointerIntPair.h
+++ b/include/llvm/ADT/PointerIntPair.h
@@ -53,8 +53,9 @@ public:
   }
   
   void setInt(IntType Int) {
-    assert(intptr_t(Int) < (1 << IntBits) && "Integer too large for field");
-    Value = reinterpret_cast<intptr_t>(getPointer()) | (intptr_t)Int;
+    intptr_t IntVal = Int;
+    assert(IntVal < (1 << IntBits) && "Integer too large for field");
+    Value = reinterpret_cast<intptr_t>(getPointer()) | IntVal;
   }
   
   void *getOpaqueValue() const { return reinterpret_cast<void*>(Value); }