summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Foad <jay.foad@gmail.com>2011-01-17 15:18:06 +0000
committerJay Foad <jay.foad@gmail.com>2011-01-17 15:18:06 +0000
commit0d1941a46fecefc1bbb83dc358a7092f49eb1890 (patch)
tree3750f8d1e9de61d10679028ddfb3fdec1b8d9610
parent9dcb98cbe73e151490054d361834e955a80c4950 (diff)
downloadllvm-0d1941a46fecefc1bbb83dc358a7092f49eb1890.tar.gz
llvm-0d1941a46fecefc1bbb83dc358a7092f49eb1890.tar.bz2
llvm-0d1941a46fecefc1bbb83dc358a7092f49eb1890.tar.xz
Remove useless Tag enumeration.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123623 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Use.h15
-rw-r--r--lib/VMCore/Use.cpp4
-rw-r--r--lib/VMCore/User.cpp5
3 files changed, 10 insertions, 14 deletions
diff --git a/include/llvm/Use.h b/include/llvm/Use.h
index 1b8f48921e..96e07f8894 100644
--- 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 4e959a516c..2258b8d985 100644
--- 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 153eb34e09..ba2b2081db 100644
--- 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);
}