In isUIntN, make sure N is less than 64 before using in a shift to avoid undefined...

[oota-llvm.git] / include / llvm / Support / PointerLikeTypeTraits.h

diff --git a/include/llvm/Support/PointerLikeTypeTraits.h b/include/llvm/Support/PointerLikeTypeTraits.h
index b0edd3bd09f99d8049cf27b9d21a5d8f82366c85..8e6659c92fd6400e0dabe07dca78699f6f1a5262 100644 (file)
--- a/include/llvm/Support/PointerLikeTypeTraits.h
+++ b/include/llvm/Support/PointerLikeTypeTraits.h
@@ -18,7 +18,7 @@
 #include "llvm/Support/DataTypes.h"
 
 namespace llvm {
-  
+
 /// PointerLikeTypeTraits - This is a traits object that is used to handle
 /// pointer types and things that are just wrappers for pointers as a uniform
 /// entity.
@@ -33,12 +33,10 @@ class PointerLikeTypeTraits {
 template<typename T>
 class PointerLikeTypeTraits<T*> {
 public:
-  static inline void *getAsVoidPointer(T* P) { return P; }
-  static inline T *getFromVoidPointer(void *P) {
-    return static_cast<T*>(P);
-  }
-  
-  /// Note, we assume here that malloc returns objects at least 8-byte aligned.
+  static inline void *getAsVoidPointer(T *P) { return P; }
+  static inline T *getFromVoidPointer(void *P) { return static_cast<T *>(P); }
+
+  /// Note, we assume here that malloc returns objects at least 4-byte aligned.
   /// However, this may be wrong, or pointers may be from something other than
   /// malloc.  In this case, you should specialize this template to reduce this.
   ///
@@ -46,16 +44,20 @@ public:
   /// this is actually true.
   enum { NumLowBitsAvailable = 2 };
 };
-  
+
 // Provide PointerLikeTypeTraits for const pointers.
 template<typename T>
 class PointerLikeTypeTraits<const T*> {
+  typedef PointerLikeTypeTraits<T*> NonConst;
+
 public:
-  static inline const void *getAsVoidPointer(const T* P) { return P; }
+  static inline const void *getAsVoidPointer(const T* P) {
+    return NonConst::getAsVoidPointer(const_cast<T*>(P));
+  }
   static inline const T *getFromVoidPointer(const void *P) {
-    return static_cast<const T*>(P);
+    return NonConst::getFromVoidPointer(const_cast<void*>(P));
   }
-  enum { NumLowBitsAvailable = 2 };
+  enum { NumLowBitsAvailable = NonConst::NumLowBitsAvailable };
 };
 
 // Provide PointerLikeTypeTraits for uintptr_t.
@@ -71,7 +73,7 @@ public:
   // No bits are available!
   enum { NumLowBitsAvailable = 0 };
 };
-  
+
 } // end namespace llvm
 
 #endif