Make getContainedType more efficient by not returning null if out of range!

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

diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index f8eceb7ec05aac2f43a6fcae08acd175107ede89..628e32cedbd2539686e55915435cc121e4fb49e6 100644 (file)
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -1,4 +1,4 @@
-//===-- llvm/Value.h - Definition of the Value class -------------*- C++ -*--=//
+//===-- llvm/Value.h - Definition of the Value class ------------*- C++ -*-===//
 //
 // This file defines the very important Value class.  This is subclassed by a
 // bunch of other important classes, like Instruction, Function, Type, etc...
@@ -10,8 +10,8 @@
 #ifndef LLVM_VALUE_H
 #define LLVM_VALUE_H
 
-#include "llvm/Annotation.h"
 #include "llvm/AbstractTypeUser.h"
+#include "Support/Annotation.h"
 #include "Support/Casting.h"
 #include <iostream>
 #include <vector>
@@ -34,9 +34,7 @@ class SymbolTable;
 /// Value - The base class of all values computed by a program that may be used
 /// as operands to other values.
 ///
-class Value : public Annotable,         // Values are annotable
-             public AbstractTypeUser { // Values use potentially abstract types
-public:
+struct Value : public Annotable {         // Values are annotable
   enum ValueTy {
     TypeVal,                // This is an instance of Type
     ConstantVal,            // This is an instance of Constant
@@ -50,7 +48,7 @@ public:
 private:
   std::vector<User *> Uses;
   std::string Name;
-  PATypeHandle<Type> Ty;
+  PATypeHolder Ty;
   ValueTy VTy;
 
   void operator=(const Value &);     // Do not implement
@@ -61,7 +59,7 @@ public:
   
   /// dump - Support for debugging, callable in GDB: V->dump()
   //
-  void dump() const;
+  virtual void dump() const;
 
   /// print - Implement operator<< on Value...
   ///
@@ -89,12 +87,10 @@ public:
   ///
   void replaceAllUsesWith(Value *V);
 
-  /// refineAbstractType - This function is implemented because we use
-  /// potentially abstract types, and these types may be resolved to more
-  /// concrete types after we are constructed.
-  ///
-  virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy);
-  
+  // uncheckedReplaceAllUsesWith - Just like replaceAllUsesWith but dangerous.
+  // Only use when in type resolution situations!
+  void uncheckedReplaceAllUsesWith(Value *V);
+
   //----------------------------------------------------------------------
   // Methods for handling the vector of uses of this Value.
   //
@@ -110,9 +106,8 @@ public:
   inline User              *use_back()        { return Uses.back();  }
   inline const User        *use_back()  const { return Uses.back();  }
 
-  inline void use_push_back(User *I)   { Uses.push_back(I); }
-  User *use_remove(use_iterator &I);
-
+  /// addUse/killUse - These two methods should only be used by the Use class
+  /// below.
   inline void addUse(User *I)      { Uses.push_back(I); }
   void killUse(User *I);
 };
@@ -132,45 +127,42 @@ inline std::ostream &operator<<(std::ostream &OS, const Value &V) {
 
 
 //===----------------------------------------------------------------------===//
-//                                 UseTy Class
+//                                  Use Class
 //===----------------------------------------------------------------------===//
 
-// UseTy and it's friendly typedefs (Use) are here to make keeping the "use" 
-// list of a definition node up-to-date really easy.
+// Use is here to make keeping the "use" list of a Value up-to-date really easy.
 //
-template<class ValueSubclass>
-class UseTy {
-  ValueSubclass *Val;
+class Use {
+  Value *Val;
   User *U;
 public:
-  inline UseTy<ValueSubclass>(ValueSubclass *v, User *user) {
+  inline Use(Value *v, User *user) {
     Val = v; U = user;
     if (Val) Val->addUse(U);
   }
 
-  inline ~UseTy<ValueSubclass>() { if (Val) Val->killUse(U); }
-
-  inline operator ValueSubclass *() const { return Val; }
-
-  inline UseTy<ValueSubclass>(const UseTy<ValueSubclass> &user) {
+  inline Use(const Use &user) {
     Val = 0;
     U = user.U;
     operator=(user.Val);
   }
-  inline ValueSubclass *operator=(ValueSubclass *V) { 
+  inline ~Use() { if (Val) Val->killUse(U); }
+  inline operator Value*() const { return Val; }
+
+  inline Value *operator=(Value *V) { 
     if (Val) Val->killUse(U);
     Val = V;
     if (V) V->addUse(U);
     return V;
   }
 
-  inline       ValueSubclass *operator->()       { return Val; }
-  inline const ValueSubclass *operator->() const { return Val; }
+  inline       Value *operator->()       { return Val; }
+  inline const Value *operator->() const { return Val; }
 
-  inline       ValueSubclass *get()       { return Val; }
-  inline const ValueSubclass *get() const { return Val; }
+  inline       Value *get()       { return Val; }
+  inline const Value *get() const { return Val; }
 
-  inline UseTy<ValueSubclass> &operator=(const UseTy<ValueSubclass> &user) {
+  inline const Use &operator=(const Use &user) {
     if (Val) Val->killUse(U);
     Val = user.Val;
     Val->addUse(U);
@@ -178,19 +170,17 @@ public:
   }
 };
 
-typedef UseTy<Value> Use;    // Provide Use as a common UseTy type
-
-template<typename From> struct simplify_type<UseTy<From> > {
-  typedef typename simplify_type<From*>::SimpleType SimpleType;
+template<> struct simplify_type<Use> {
+  typedef Value* SimpleType;
   
-  static SimpleType getSimplifiedValue(const UseTy<From> &Val) {
+  static SimpleType getSimplifiedValue(const Use &Val) {
     return (SimpleType)Val.get();
   }
 };
-template<typename From> struct simplify_type<const UseTy<From> > {
-  typedef typename simplify_type<From*>::SimpleType SimpleType;
+template<> struct simplify_type<const Use> {
+  typedef Value* SimpleType;
   
-  static SimpleType getSimplifiedValue(const UseTy<From> &Val) {
+  static SimpleType getSimplifiedValue(const Use &Val) {
     return (SimpleType)Val.get();
   }
 };