Remove extranous #include

[oota-llvm.git] / include / llvm / iOther.h

diff --git a/include/llvm/iOther.h b/include/llvm/iOther.h
index d0e0e2e195254dca90a026d9d66a5fd89a9962ca..85698da76176d8f0442b2b13007f38067fedd98f 100644 (file)
--- a/include/llvm/iOther.h
+++ b/include/llvm/iOther.h
@@ -11,63 +11,6 @@
 #include "llvm/InstrTypes.h"
 #include "llvm/Method.h"
 
-//===----------------------------------------------------------------------===//
-//                               PHINode Class
-//===----------------------------------------------------------------------===//
-
-// PHINode - The PHINode class is used to represent the magical mystical PHI
-// node, that can not exist in nature, but can be synthesized in a computer
-// scientist's overactive imagination.
-//
-class PHINode : public Instruction {
-  PHINode(const PHINode &PN);
-public:
-  PHINode(const Type *Ty, const string &Name = "");
-
-  virtual Instruction *clone() const { return new PHINode(*this); }
-  virtual const char *getOpcodeName() const { return "phi"; }
-
-  // getNumIncomingValues - Return the number of incoming edges the PHI node has
-  inline unsigned getNumIncomingValues() const { return Operands.size()/2; }
-
-  // getIncomingValue - Return incoming value #x
-  inline const Value *getIncomingValue(unsigned i) const {
-    return Operands[i*2];
-  }
-  inline Value *getIncomingValue(unsigned i) {
-    return Operands[i*2];
-  }
-  inline void setIncomingValue(unsigned i, Value *V) {
-    Operands[i*2] = V;
-  }
-
-  // getIncomingBlock - Return incoming basic block #x
-  inline const BasicBlock *getIncomingBlock(unsigned i) const { 
-    return cast<const BasicBlock>(Operands[i*2+1]);
-  }
-  inline BasicBlock *getIncomingBlock(unsigned i) { 
-    return cast<BasicBlock>(Operands[i*2+1]);
-  }
-
-  // addIncoming - Add an incoming value to the end of the PHI list
-  void addIncoming(Value *D, BasicBlock *BB);
-
-  // removeIncomingValue - Remove an incoming value.  This is useful if a
-  // predecessor basic block is deleted.  The value removed is returned.
-  Value *removeIncomingValue(const BasicBlock *BB);
-
-
-  // Methods for support type inquiry through isa, cast, and dyn_cast:
-  static inline bool classof(const PHINode *) { return true; }
-  static inline bool classof(const Instruction *I) {
-    return I->getOpcode() == Instruction::PHINode; 
-  }
-  static inline bool classof(const Value *V) {
-    return isa<Instruction>(V) && classof(cast<Instruction>(V));
-  }
-};
-
-
 //===----------------------------------------------------------------------===//
 //                                 CastInst Class
 //===----------------------------------------------------------------------===//
@@ -81,7 +24,7 @@ class CastInst : public Instruction {
     Operands.push_back(Use(CI.Operands[0], this));
   }
 public:
-  CastInst(Value *S, const Type *Ty, const string &Name = "")
+  CastInst(Value *S, const Type *Ty, const std::string &Name = "")
     : Instruction(Ty, Cast, Name) {
     Operands.reserve(1);
     Operands.push_back(Use(S, this));
@@ -112,13 +55,13 @@ class MethodArgument : public Value {  // Defined in the InstrType.cpp file
   inline void setParent(Method *parent) { Parent = parent; }
 
 public:
-  MethodArgument(const Type *Ty, const string &Name = "") 
+  MethodArgument(const Type *Ty, const std::string &Name = "") 
     : Value(Ty, Value::MethodArgumentVal, Name) {
     Parent = 0;
   }
 
   // Specialize setName to handle symbol table majik...
-  virtual void setName(const string &name, SymbolTable *ST = 0);
+  virtual void setName(const std::string &name, SymbolTable *ST = 0);
 
   inline const Method *getParent() const { return Parent; }
   inline       Method *getParent()       { return Parent; }
@@ -138,21 +81,24 @@ public:
 class CallInst : public Instruction {
   CallInst(const CallInst &CI);
 public:
-  CallInst(Method *M, const vector<Value*> &params, const string &Name = "");
+  CallInst(Value *M, const std::vector<Value*> &Par, const std::string & = "");
 
   virtual const char *getOpcodeName() const { return "call"; }
 
   virtual Instruction *clone() const { return new CallInst(*this); }
   bool hasSideEffects() const { return true; }
 
-
   const Method *getCalledMethod() const {
-    return cast<Method>(Operands[0]);
+    return dyn_cast<Method>(Operands[0]);
   }
   Method *getCalledMethod() {
-    return  cast<Method>(Operands[0]); 
+    return dyn_cast<Method>(Operands[0]); 
   }
 
+  // getCalledValue - Get a pointer to a method that is invoked by this inst.
+  inline const Value *getCalledValue() const { return Operands[0]; }
+  inline       Value *getCalledValue()       { return Operands[0]; }
+
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const CallInst *) { return true; }
   static inline bool classof(const Instruction *I) {
@@ -177,7 +123,7 @@ class ShiftInst : public Instruction {
     Operands.push_back(Use(SI.Operands[1], this));
   }
 public:
-  ShiftInst(OtherOps Opcode, Value *S, Value *SA, const string &Name = "")
+  ShiftInst(OtherOps Opcode, Value *S, Value *SA, const std::string &Name = "")
     : Instruction(S->getType(), Opcode, Name) {
     assert((Opcode == Shl || Opcode == Shr) && "ShiftInst Opcode invalid!");
     Operands.reserve(2);
@@ -185,6 +131,8 @@ public:
     Operands.push_back(Use(SA, this));
   }
 
+  OtherOps getOpcode() const { return (OtherOps)Instruction::getOpcode(); }
+
   virtual Instruction *clone() const { return new ShiftInst(*this); }
   virtual const char *getOpcodeName() const {
     return getOpcode() == Shl ? "shl" : "shr";