[llvm-branch-commits] [llvm-branch] r155375 - in /llvm/branches/release_31: ./ include/llvm/CodeGen/SlotIndexes.h

[Bill Wendling]

Author: void
Date: Mon Apr 23 13:33:11 2012
New Revision: 155375

URL: http://llvm.org/viewvc/llvm-project?rev=155375&view=rev
Log:
Merging r155288:
------------------------------------------------------------------------
r155288 | d0k | 2012-04-21 09:05:27 -0700 (Sat, 21 Apr 2012) | 6 lines

Remove unused PointerLikeTypeTraits for IndexListEntry.

It set NumLowBitAvailable = 3 which may not be true on all platforms.  We only
ever use 2 bits (the default) so this assumption can be safely removed

Should fix PR12612.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/include/llvm/CodeGen/SlotIndexes.h

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 13:33:11 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284-155285,155307,155342
+/llvm/trunk:155230,155284-155285,155288,155307,155342

Modified: llvm/branches/release_31/include/llvm/CodeGen/SlotIndexes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/include/llvm/CodeGen/SlotIndexes.h?rev=155375&r1=155374&r2=155375&view=diff
==============================================================================
--- llvm/branches/release_31/include/llvm/CodeGen/SlotIndexes.h (original)
+++ llvm/branches/release_31/include/llvm/CodeGen/SlotIndexes.h Mon Apr 23 13:33:11 2012
@@ -73,19 +73,6 @@
     void createNode(const IndexListEntry &);
   };
 
-  // Specialize PointerLikeTypeTraits for IndexListEntry.
-  template <>
-  class PointerLikeTypeTraits<IndexListEntry*> {
-  public:
-    static inline void* getAsVoidPointer(IndexListEntry *p) {
-      return p;
-    }
-    static inline IndexListEntry* getFromVoidPointer(void *p) {
-      return static_cast<IndexListEntry*>(p);
-    }
-    enum { NumLowBitsAvailable = 3 };
-  };
-
   /// SlotIndex - An opaque wrapper around machine indexes.
   class SlotIndex {
     friend class SlotIndexes;