12 files changed, 17 insertions, 32 deletions
diff --git a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
index dbbcd6a..0bdd7f9 100644
--- a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
+++ b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
@@ -62,7 +62,7 @@
 #define FUNCTION_LIVE_VAR_INFO_H
 
 #include "llvm/Pass.h"
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 
 class BBLiveVar;
 class MachineInstr;
diff --git a/include/llvm/Analysis/LiveVar/ValueSet.h b/include/llvm/Analysis/LiveVar/ValueSet.h
deleted file mode 100644
index 88897bf..0000000
--- a/include/llvm/Analysis/LiveVar/ValueSet.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef VALUE_SET_H
-#define VALUE_SET_H
-
-#include <set>
-class Value;
-
-// RAV - Used to print values in a form used by the register allocator.  
-//
-struct RAV {  // Register Allocator Value
-  const Value &V;
-  RAV(const Value *v) : V(*v) {}
-  RAV(const Value &v) : V(v) {}
-};
-std::ostream &operator<<(std::ostream &out, RAV Val);
-
-
-typedef std::set<const Value*> ValueSet;
-void printSet(const ValueSet &S);
-
-#endif
diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h
index dbbcd6a..0bdd7f9 100644
--- a/include/llvm/CodeGen/FunctionLiveVarInfo.h
+++ b/include/llvm/CodeGen/FunctionLiveVarInfo.h
@@ -62,7 +62,7 @@
 #define FUNCTION_LIVE_VAR_INFO_H
 
 #include "llvm/Pass.h"
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 
 class BBLiveVar;
 class MachineInstr;
diff --git a/include/llvm/CodeGen/ValueSet.h b/include/llvm/CodeGen/ValueSet.h
index 88897bf..fa4159a 100644
--- a/include/llvm/CodeGen/ValueSet.h
+++ b/include/llvm/CodeGen/ValueSet.h
@@ -1,3 +1,8 @@
+//
+// VALUESET.H - This header is OBSOLETE, do not use it for new code.
+//
+// FIXME: Eliminate this file.
+
 #ifndef VALUE_SET_H
 #define VALUE_SET_H
 
diff --git a/lib/Analysis/LiveVar/BBLiveVar.h b/lib/Analysis/LiveVar/BBLiveVar.h
index ca2c48e..ab11a93 100644
--- a/lib/Analysis/LiveVar/BBLiveVar.h
+++ b/lib/Analysis/LiveVar/BBLiveVar.h
@@ -8,7 +8,7 @@
 #ifndef LIVE_VAR_BB_H
 #define LIVE_VAR_BB_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "Support/Annotation.h"
 #include <map>
 class BasicBlock;
diff --git a/lib/Analysis/LiveVar/ValueSet.cpp b/lib/Analysis/LiveVar/ValueSet.cpp
index 1914f03..d50d107 100644
--- a/lib/Analysis/LiveVar/ValueSet.cpp
+++ b/lib/Analysis/LiveVar/ValueSet.cpp
@@ -1,7 +1,7 @@
 
+// FIXME: Eliminate this file.
 
-
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 #include <iostream>
 
diff --git a/lib/CodeGen/RegAlloc/LiveRange.h b/lib/CodeGen/RegAlloc/LiveRange.h
index 71eba15..3a88a27 100644
--- a/lib/CodeGen/RegAlloc/LiveRange.h
+++ b/lib/CodeGen/RegAlloc/LiveRange.h
@@ -11,7 +11,7 @@
 #ifndef LIVE_RANGE_H
 #define LIVE_RANGE_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 
 class RegClass;
diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.h b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
index 71fda16..3d9a43a 100644
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.h
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
@@ -20,7 +20,7 @@
 #define LIVE_RANGE_INFO_H
 
 #include "Support/HashExtras.h"
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 
 class LiveRange;
 class MachineInstr;
diff --git a/lib/Target/SparcV9/LiveVar/BBLiveVar.h b/lib/Target/SparcV9/LiveVar/BBLiveVar.h
index ca2c48e..ab11a93 100644
--- a/lib/Target/SparcV9/LiveVar/BBLiveVar.h
+++ b/lib/Target/SparcV9/LiveVar/BBLiveVar.h
@@ -8,7 +8,7 @@
 #ifndef LIVE_VAR_BB_H
 #define LIVE_VAR_BB_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "Support/Annotation.h"
 #include <map>
 class BasicBlock;
diff --git a/lib/Target/SparcV9/LiveVar/ValueSet.cpp b/lib/Target/SparcV9/LiveVar/ValueSet.cpp
index 1914f03..d50d107 100644
--- a/lib/Target/SparcV9/LiveVar/ValueSet.cpp
+++ b/lib/Target/SparcV9/LiveVar/ValueSet.cpp
@@ -1,7 +1,7 @@
 
+// FIXME: Eliminate this file.
 
-
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 #include <iostream>
 
diff --git a/lib/Target/SparcV9/RegAlloc/LiveRange.h b/lib/Target/SparcV9/RegAlloc/LiveRange.h
index 71eba15..3a88a27 100644
--- a/lib/Target/SparcV9/RegAlloc/LiveRange.h
+++ b/lib/Target/SparcV9/RegAlloc/LiveRange.h
@@ -11,7 +11,7 @@
 #ifndef LIVE_RANGE_H
 #define LIVE_RANGE_H
 
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 #include "llvm/Value.h"
 
 class RegClass;
diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
index 71fda16..3d9a43a 100644
--- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
+++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
@@ -20,7 +20,7 @@
 #define LIVE_RANGE_INFO_H
 
 #include "Support/HashExtras.h"
-#include "llvm/Analysis/LiveVar/ValueSet.h"
+#include "llvm/CodeGen/ValueSet.h"
 
 class LiveRange;
 class MachineInstr;