4 files changed, 8 insertions, 9 deletions
diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h
index e7bd3ad145..aa101f934d 100644
--- a/include/llvm/CodeGen/InstrForest.h
+++ b/include/llvm/CodeGen/InstrForest.h
@@ -30,7 +30,7 @@
 #include <hash_map>
 #include <hash_set>
 
-class ConstPoolVal;
+class Constant;
 class BasicBlock;
 class Method;
 class InstrTreeNode;
@@ -205,11 +205,11 @@ protected:
 
 class ConstantNode : public InstrTreeNode {
 public:
-  ConstantNode(ConstPoolVal *constVal) 
+  ConstantNode(Constant *constVal) 
     : InstrTreeNode(NTConstNode, (Value*)constVal) {
     opLabel = ConstantNodeOp;    
   }
-  ConstPoolVal *getConstVal() const { return (ConstPoolVal*) val;}
+  Constant *getConstVal() const { return (Constant*) val;}
 protected:
   virtual void dumpNode(int indent) const;
 };
diff --git a/include/llvm/CodeGen/InstrSelection.h b/include/llvm/CodeGen/InstrSelection.h
index 1f68e38dd5..27e3ebe553 100644
--- a/include/llvm/CodeGen/InstrSelection.h
+++ b/include/llvm/CodeGen/InstrSelection.h
@@ -19,7 +19,6 @@ class InstrForest;
 class MachineInstr;
 class InstructionNode;
 class TmpInstruction;
-class ConstPoolVal;
 class TargetMachine;
 
 
diff --git a/include/llvm/CodeGen/InstrSelectionSupport.h b/include/llvm/CodeGen/InstrSelectionSupport.h
index 7d11e206b5..90b3af713d 100644
--- a/include/llvm/CodeGen/InstrSelectionSupport.h
+++ b/include/llvm/CodeGen/InstrSelectionSupport.h
@@ -21,7 +21,7 @@ class InstrForest;
 class MachineInstr;
 class InstructionNode;
 class TmpInstruction;
-class ConstPoolVal;
+class Constant;
 class TargetMachine;
 
 //************************ Exported Functions ******************************/
@@ -54,7 +54,7 @@ int64_t         GetConstantValueAsSignedInt     (const Value *V,
 //---------------------------------------------------------------------------
 
 Value*		FoldGetElemChain    (const InstructionNode* getElemInstrNode,
-				     vector<ConstPoolVal*>& chainIdxVec);
+				     vector<Constant*>& chainIdxVec);
 
 
 //------------------------------------------------------------------------ 
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index a20431848e..7c347a43ca 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -529,7 +529,7 @@ private:
   unsigned	currentOptionalArgsSize;
   unsigned	maxOptionalArgsSize;
   unsigned	currentTmpValuesSize;
-  hash_set<const ConstPoolVal*> constantsForConstPool;
+  hash_set<const Constant*> constantsForConstPool;
   hash_map<const Value*, int> offsets;
   // hash_map<const Value*, int> offsetsFromSP;
   
@@ -572,7 +572,7 @@ public:
   inline unsigned getMaxOptionalArgsSize() const { return maxOptionalArgsSize;}
   inline unsigned getCurrentOptionalArgsSize() const
                                              { return currentOptionalArgsSize;}
-  inline const hash_set<const ConstPoolVal*>&
+  inline const hash_set<const Constant*>&
                   getConstantPoolValues() const {return constantsForConstPool;}
   
   //
@@ -580,7 +580,7 @@ public:
   // 
   void            initializeFrameLayout    (const TargetMachine& target);
   
-  void            addToConstantPool        (const ConstPoolVal* constVal)
+  void            addToConstantPool        (const Constant* constVal)
                                     { constantsForConstPool.insert(constVal); }
   
   inline void     markAsLeafMethod()              { compiledAsLeaf = true; }