Remove useless Tag enumeration.

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

diff --git a/include/llvm/Use.h b/include/llvm/Use.h
index 1b8f48921ed01d23dcfe264d1fe2763dca53ed40..96e07f88940104407d0cab4c07f03221c98ca637 100644 (file)
--- a/include/llvm/Use.h
+++ b/include/llvm/Use.h
@@ -25,9 +25,7 @@
 #ifndef LLVM_USE_H
 #define LLVM_USE_H
 
-#include "llvm/Support/Casting.h"
 #include "llvm/ADT/PointerIntPair.h"
-#include <cstddef>
 #include <iterator>
 
 namespace llvm {
@@ -36,9 +34,6 @@ class Value;
 class User;
 class Use;
 
-/// Tag - generic tag type for (at least 32 bit) pointers
-enum Tag { noTag, tagOne, tagTwo, tagThree };
-
 // Use** is only 4-byte aligned.
 template<>
 class PointerLikeTypeTraits<Use**> {
@@ -71,10 +66,10 @@ private:
     if (Val) removeFromList();
   }
 
-  enum PrevPtrTag { zeroDigitTag = noTag
-                  , oneDigitTag = tagOne
-                  , stopTag = tagTwo
-                  , fullStopTag = tagThree };
+  enum PrevPtrTag { zeroDigitTag
+                  , oneDigitTag
+                  , stopTag
+                  , fullStopTag };
 
   /// Constructor
   Use(PrevPtrTag tag) : Val(0) {
@@ -215,7 +210,7 @@ public:
 //===----------------------------------------------------------------------===//
 
 struct AugmentedUse : public Use {
-  PointerIntPair<User*, 1, Tag> ref;
+  PointerIntPair<User*, 1, unsigned> ref;
   AugmentedUse(); // not implemented
 };
 

diff --git a/lib/VMCore/Use.cpp b/lib/VMCore/Use.cpp
index 4e959a516cd4b58f91c9e4949c816e12c0451fc2..2258b8d985ae066ff85471a292b0aec48678a563 100644 (file)
--- a/lib/VMCore/Use.cpp
+++ b/lib/VMCore/Use.cpp
@@ -135,8 +135,8 @@ void Use::zap(Use *Start, const Use *Stop, bool del) {
 
 User *Use::getUser() const {
   const Use *End = getImpliedUser();
-  const PointerIntPair<User*, 1, Tag>& ref(
-                                static_cast<const AugmentedUse*>(End - 1)->ref);
+  const PointerIntPair<User*, 1, unsigned>&
+    ref(static_cast<const AugmentedUse*>(End - 1)->ref);
   User *She = ref.getPointer();
   return ref.getInt()
     ? She

diff --git a/lib/VMCore/User.cpp b/lib/VMCore/User.cpp
index 153eb34e0904bcff61bc1f1f9f86b726bba4a9bc..ba2b2081db57ebf460aec5fe270514e957b9fd37 100644 (file)
--- a/lib/VMCore/User.cpp
+++ b/lib/VMCore/User.cpp
@@ -44,9 +44,10 @@ Use *User::allocHungoffUses(unsigned N) const {
                                                 + sizeof(AugmentedUse)
                                                 - sizeof(Use)));
   Use *End = Begin + N;
-  PointerIntPair<User*, 1, Tag>& ref(static_cast<AugmentedUse&>(End[-1]).ref);
+  PointerIntPair<User*, 1, unsigned>&
+    ref(static_cast<AugmentedUse&>(End[-1]).ref);
   ref.setPointer(const_cast<User*>(this));
-  ref.setInt(tagOne);
+  ref.setInt(1);
   return Use::initTags(Begin, End);
 }