From: Chris Lattner Date: Sun, 29 Mar 2009 00:39:30 +0000 (+0000) Subject: rename PointerLikeTypeInto to PointerLikeTypeTraits, add trait for X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ee1b5e916249d1a64ad8cf99b08a0e160f9d052;p=oota-llvm.git rename PointerLikeTypeInto to PointerLikeTypeTraits, add trait for # low bits free, and move to its own header. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67973 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h index 92259298efc..7b3283c96d2 100644 --- a/include/llvm/ADT/PointerIntPair.h +++ b/include/llvm/ADT/PointerIntPair.h @@ -22,7 +22,7 @@ namespace llvm { template struct DenseMapInfo; template -class PointerLikeTypeInfo; +class PointerLikeTypeTraits; /// PointerIntPair - This class implements a pair of a pointer and small /// integer. It is designed to represent this in the space required by one @@ -97,7 +97,7 @@ struct DenseMapInfo > { // Teach SmallPtrSet that PointerIntPair is "basically a pointer". template -class PointerLikeTypeInfo > { +class PointerLikeTypeTraits > { public: static inline void * getAsVoidPointer(const PointerIntPair &P) { @@ -107,6 +107,7 @@ public: getFromVoidPointer(void *P) { return PointerIntPair::getFromOpaqueValue(P); } + static inline unsigned getNumLowBitsAvailable() { return 0; } }; } // end namespace llvm diff --git a/include/llvm/ADT/SmallPtrSet.h b/include/llvm/ADT/SmallPtrSet.h index 47af22884dd..a189de2c227 100644 --- a/include/llvm/ADT/SmallPtrSet.h +++ b/include/llvm/ADT/SmallPtrSet.h @@ -18,33 +18,9 @@ #include #include #include "llvm/Support/DataTypes.h" +#include "llvm/Support/PointerLikeTypeTraits.h" namespace llvm { - -/// PointerLikeTypeInfo - This is a traits object that is used to handle pointer -/// types and things that are just wrappers for pointers as a uniform entity. -template -class PointerLikeTypeInfo { - //getAsVoidPointer/getFromVoidPointer -}; - -// Provide PointerLikeTypeInfo for all pointers. -template -class PointerLikeTypeInfo { -public: - static inline void *getAsVoidPointer(T* P) { return P; } - static inline T *getFromVoidPointer(void *P) { - return static_cast(P); - } -}; -template -class PointerLikeTypeInfo { -public: - static inline const void *getAsVoidPointer(const T* P) { return P; } - static inline const T *getFromVoidPointer(const void *P) { - return static_cast(P); - } -}; class SmallPtrSetIteratorImpl; @@ -193,7 +169,7 @@ protected: /// SmallPtrSetIterator - This implements a const_iterator for SmallPtrSet. template class SmallPtrSetIterator : public SmallPtrSetIteratorImpl { - typedef PointerLikeTypeInfo PtrTraits; + typedef PointerLikeTypeTraits PtrTraits; public: explicit SmallPtrSetIterator(const void *const *BP) : SmallPtrSetIteratorImpl(BP) {} @@ -250,7 +226,7 @@ class SmallPtrSet : public SmallPtrSetImpl { // Make sure that SmallSize is a power of two, round up if not. enum { SmallSizePowTwo = NextPowerOfTwo::Val }; void *SmallArray[SmallSizePowTwo]; - typedef PointerLikeTypeInfo PtrTraits; + typedef PointerLikeTypeTraits PtrTraits; public: SmallPtrSet() : SmallPtrSetImpl(NextPowerOfTwo::Val) {} SmallPtrSet(const SmallPtrSet &that) : SmallPtrSetImpl(that) {} diff --git a/include/llvm/Support/PointerLikeTypeTraits.h b/include/llvm/Support/PointerLikeTypeTraits.h new file mode 100644 index 00000000000..41b2302381f --- /dev/null +++ b/include/llvm/Support/PointerLikeTypeTraits.h @@ -0,0 +1,61 @@ +//===- llvm/Support/PointerLikeTypeTraits.h - Pointer Traits ----*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file defines the PointerLikeTypeTraits class. This allows data +// structures to reason about pointers and other things that are pointer sized. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_POINTERLIKETYPETRAITS_H +#define LLVM_SUPPORT_POINTERLIKETYPETRAITS_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. +template +class PointerLikeTypeTraits { + // getAsVoidPointer + // getFromVoidPointer + // getNumLowBitsAvailable +}; + +// Provide PointerLikeTypeTraits for non-cvr pointers. +template +class PointerLikeTypeTraits { +public: + static inline void *getAsVoidPointer(T* P) { return P; } + static inline T *getFromVoidPointer(void *P) { + return static_cast(P); + } + + /// Note, we assume here that malloc returns objects at least 8-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. + /// + /// All clients should use assertions to do a run-time check to ensure that + /// this is actually true. + static inline unsigned getNumLowBitsAvailable() { return 3; } +}; + +// Provide PointerLikeTypeTraits for const pointers. +template +class PointerLikeTypeTraits { +public: + static inline const void *getAsVoidPointer(const T* P) { return P; } + static inline const T *getFromVoidPointer(const void *P) { + return static_cast(P); + } + static inline unsigned getNumLowBitsAvailable() { return 3; } +}; + +} // end namespace llvm + +#endif