[llvm-commits] CVS: llvm/include/llvm/Constant.h Constants.h

[Chris Lattner]

Changes in directory llvm/include/llvm:

Constant.h updated: 1.4 -> 1.5
Constants.h updated: 1.16 -> 1.17

---
Log message:

  - Add new Constant::replaceUsesOfWithOnConstant which has an end result
    similar to User::replaceUsesOfWith but actually does the right thing for
    constants.


---
Diffs of the changes:

Index: llvm/include/llvm/Constant.h
diff -u llvm/include/llvm/Constant.h:1.4 llvm/include/llvm/Constant.h:1.5
--- llvm/include/llvm/Constant.h:1.4	Sun Aug 25 17:54:54 2002
+++ llvm/include/llvm/Constant.h	Wed Oct  9 18:12:22 2002
@@ -16,10 +16,11 @@
 
   void destroyConstantImpl();
 public:
-  /// setName - Specialize setName to handle symbol table majik...
+  // setName - Specialize setName to handle symbol table majik...
   virtual void setName(const std::string &name, SymbolTable *ST = 0);
 
   /// Static constructor to get a '0' constant of arbitrary type...
+  ///
   static Constant *getNullValue(const Type *Ty);
 
   /// isNullValue - Return true if this is the value that would be returned by
@@ -29,6 +30,7 @@
   virtual void print(std::ostream &O) const;
 
   /// isConstantExpr - Return true if this is a ConstantExpr
+  ///
   virtual bool isConstantExpr() const { return false; }
 
 
@@ -49,10 +51,29 @@
   virtual void destroyConstant() { assert(0 && "Not reached!"); }
 
   
-  /// Methods for support type inquiry through isa, cast, and dyn_cast:
+  //// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const Constant *) { return true; }
   static inline bool classof(const Value *V) {
     return V->getValueType() == Value::ConstantVal;
+  }
+
+  /// replaceUsesOfWithOnConstant - This method is a special form of
+  /// User::replaceUsesOfWith (which does not work on constants) that does work
+  /// on constants.  Basically this method goes through the trouble of building
+  /// a new constant that is equivalent to the current one, with all uses of
+  /// From replaced with uses of To.  After this construction is completed, all
+  /// of the users of 'this' are replaced to use the new constant, and then
+  /// 'this' is deleted.  In general, you should not call this method, instead,
+  /// use Value::replaceAllUsesWith, which automatically dispatches to this
+  /// method as needed.
+  ///
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To) {
+    // Provide a default implementation for constants (like integers) that
+    // cannot use any other values.  This cannot be called at runtime, but needs
+    // to be here to avoid link errors.
+    assert(getNumOperands() == 0 && "replaceUsesOfWithOnConstant must be "
+           "implemented for all constants that have operands!");
+    assert(0 && "Constants that do not have operands cannot be using 'From'!");
   }
 
   // WARNING: Only to be used by Bytecode & Assembly Parsers!  USER CODE SHOULD


Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.16 llvm/include/llvm/Constants.h:1.17
--- llvm/include/llvm/Constants.h:1.16	Mon Aug 26 12:53:53 2002
+++ llvm/include/llvm/Constants.h	Wed Oct  9 18:12:22 2002
@@ -292,6 +292,7 @@
   virtual bool isNullValue() const { return false; }
 
   virtual void destroyConstant();
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To);
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantArray *) { return true; }
@@ -330,6 +331,7 @@
   virtual bool isNullValue() const { return false; }
 
   virtual void destroyConstant();
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To);
   
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantStruct *) { return true; }
@@ -423,6 +425,7 @@
   }
 
   virtual void destroyConstant();
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To);
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantPointerRef *) { return true; }
@@ -489,6 +492,7 @@
   virtual bool isConstantExpr() const { return true; }
 
   virtual void destroyConstant();
+  virtual void replaceUsesOfWithOnConstant(Value *From, Value *To);
     
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ConstantExpr *) { return true; }