4 files changed, 22 insertions, 37 deletions
diff --git a/include/llvm/Constant.h b/include/llvm/Constant.h
index 3105cea..a7ec633 100644
--- a/include/llvm/Constant.h
+++ b/include/llvm/Constant.h
@@ -79,7 +79,7 @@ public:
   // WARNING: Only to be used by Bytecode & Assembly Parsers!  USER CODE SHOULD
   // NOT USE THIS!!
   // Returns the number of uses of OldV that were replaced.
-  virtual unsigned mutateReferences(Value* OldV, Value *NewV) { return 0; }
+  unsigned mutateReferences(Value* OldV, Value *NewV);
   // END WARNING!!
 };
 
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h
index a91c197..ec63458 100644
--- a/include/llvm/Constants.h
+++ b/include/llvm/Constants.h
@@ -439,12 +439,6 @@ public:
   static inline bool classof(const Value *V) {
     return isa<ConstantPointer>(V) && classof(cast<ConstantPointer>(V));
   }
-
-  // WARNING: Only to be used by Bytecode & Assembly Parsers!  USER CODE SHOULD
-  // NOT USE THIS!!
-  // Returns the number of uses of OldV that were replaced.
-  virtual unsigned mutateReferences(Value* OldV, Value *NewV);
-  // END WARNING!!
 };
 
 
@@ -502,14 +496,6 @@ public:
   static inline bool classof(const Value *V) {
     return isa<Constant>(V) && classof(cast<Constant>(V));
   }
-
-public:
-  // WARNING: Only to be used by Bytecode & Assembly Parsers!  USER CODE SHOULD
-  // NOT USE THIS!!
-  // Returns the number of uses of OldV that were replaced.
-  virtual unsigned mutateReferences(Value* OldV, Value *NewV);
-  // END WARNING!!
 };
 
-
 #endif
diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index b34c06b..2b8c0ab 100644
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -59,7 +59,8 @@ private:
   SymbolTable *SymTab;
 
   // Accessor for the underlying GlobalValRefMap... only through the
-  // ConstantPointerRef class...
+  // Constant class...
+  friend class Constant;
   friend class ConstantPointerRef;
   void mutateConstantPointerRef(GlobalValue *OldGV, GlobalValue *NewGV);
   ConstantPointerRef *getConstantPointerRef(GlobalValue *GV);
diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index 8464c43..3887e33 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -685,27 +685,25 @@ const char *ConstantExpr::getOpcodeName() const {
   return Instruction::getOpcodeName(getOpcode());
 }
 
+unsigned Constant::mutateReferences(Value *OldV, Value *NewV) {
+  // Uses of constant pointer refs are global values, not constants!
+  if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(this)) {
+    GlobalValue *NewGV = cast<GlobalValue>(NewV);
+    GlobalValue *OldGV = CPR->getValue();
 
-//---- ConstantPointerRef::mutateReferences() implementation...
-//
-unsigned ConstantPointerRef::mutateReferences(Value *OldV, Value *NewV) {
-  assert(getValue() == OldV && "Cannot mutate old value if I'm not using it!");
-  GlobalValue *NewGV = cast<GlobalValue>(NewV);
-  getValue()->getParent()->mutateConstantPointerRef(getValue(), NewGV);
-  Operands[0] = NewGV;
-  return 1;
-}
+    assert(OldGV == OldV && "Cannot mutate old value if I'm not using it!");
 
-
-//---- ConstantPointerExpr::mutateReferences() implementation...
-//
-unsigned ConstantExpr::mutateReferences(Value* OldV, Value *NewV) {
-  unsigned NumReplaced = 0;
-  Constant *NewC = cast<Constant>(NewV);
-  for (unsigned i = 0, N = getNumOperands(); i != N; ++i)
-    if (Operands[i] == OldV) {
-      ++NumReplaced;
-      Operands[i] = NewC;
-    }
-  return NumReplaced;
+    OldGV->getParent()->mutateConstantPointerRef(OldGV, NewGV);
+    Operands[0] = NewGV;
+    return 1;
+  } else {
+    Constant *NewC = cast<Constant>(NewV);
+    unsigned NumReplaced = 0;
+    for (unsigned i = 0, N = getNumOperands(); i != N; ++i)
+      if (Operands[i] == OldV) {
+        ++NumReplaced;
+        Operands[i] = NewC;
+      }
+    return NumReplaced;
+  }
 }