From 8143d8f91a7768007e80841ac3c29f938e470900 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 14 Jan 2003 22:56:37 +0000 Subject: [PATCH] Move llvm/Analysis/LiveVar/ValueSet.h to CodeGen/ValueSet.h git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5282 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Analysis/LiveVar/FunctionLiveVarInfo.h | 2 +- include/llvm/Analysis/LiveVar/ValueSet.h | 20 ------------------- include/llvm/CodeGen/FunctionLiveVarInfo.h | 2 +- include/llvm/CodeGen/ValueSet.h | 5 +++++ lib/Analysis/LiveVar/BBLiveVar.h | 2 +- lib/Analysis/LiveVar/ValueSet.cpp | 4 ++-- lib/CodeGen/RegAlloc/LiveRange.h | 2 +- lib/CodeGen/RegAlloc/LiveRangeInfo.h | 2 +- lib/Target/SparcV9/LiveVar/BBLiveVar.h | 2 +- lib/Target/SparcV9/LiveVar/ValueSet.cpp | 4 ++-- lib/Target/SparcV9/RegAlloc/LiveRange.h | 2 +- lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h | 2 +- 12 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 include/llvm/Analysis/LiveVar/ValueSet.h diff --git a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h index dbbcd6a75bf..0bdd7f92b9c 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 88897bf3ad9..00000000000 --- a/include/llvm/Analysis/LiveVar/ValueSet.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef VALUE_SET_H -#define VALUE_SET_H - -#include -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 ValueSet; -void printSet(const ValueSet &S); - -#endif diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h index dbbcd6a75bf..0bdd7f92b9c 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 88897bf3ad9..fa4159a78e3 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 ca2c48e668d..ab11a93d7d7 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 class BasicBlock; diff --git a/lib/Analysis/LiveVar/ValueSet.cpp b/lib/Analysis/LiveVar/ValueSet.cpp index 1914f033020..d50d1073f60 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 diff --git a/lib/CodeGen/RegAlloc/LiveRange.h b/lib/CodeGen/RegAlloc/LiveRange.h index 71eba1513bd..3a88a27fa1f 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 71fda1613f8..3d9a43a9e3f 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 ca2c48e668d..ab11a93d7d7 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 class BasicBlock; diff --git a/lib/Target/SparcV9/LiveVar/ValueSet.cpp b/lib/Target/SparcV9/LiveVar/ValueSet.cpp index 1914f033020..d50d1073f60 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 diff --git a/lib/Target/SparcV9/RegAlloc/LiveRange.h b/lib/Target/SparcV9/RegAlloc/LiveRange.h index 71eba1513bd..3a88a27fa1f 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 71fda1613f8..3d9a43a9e3f 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;