Fix linking a function with qualifiers to a external function declaration:

[oota-llvm.git] / lib / VMCore / Value.cpp

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index ad2b18066843a36c766047df8010a44ca3e866b9..ac13159e30aa9f5d53930b055a1c6dcf827aa25e 100644 (file)
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -7,6 +7,8 @@
 #include "llvm/InstrTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/Constant.h"
+#include "Support/LeakDetector.h"
 #include <algorithm>
 
 //===----------------------------------------------------------------------===//
@@ -39,25 +41,28 @@ Value::~Value() {
   }
 #endif
   assert(Uses.begin() == Uses.end());
+
+  // There should be no uses of this object anymore, remove it.
+  LeakDetector::removeGarbageObject(this);
 }
 
-void Value::replaceAllUsesWith(Value *D) {
-  assert(D && "Value::replaceAllUsesWith(<null>) is invalid!");
-  assert(D != this && "V->replaceAllUsesWith(V) is NOT valid!");
-  assert(D->getType() == getType() &&
+
+
+
+void Value::replaceAllUsesWith(Value *New) {
+  assert(New && "Value::replaceAllUsesWith(<null>) is invalid!");
+  assert(New != this && "this->replaceAllUsesWith(this) is NOT valid!");
+  assert(New->getType() == getType() &&
          "replaceAllUses of value with new value of different type!");
   while (!Uses.empty()) {
     User *Use = Uses.back();
-#ifndef NDEBUG
-    unsigned NumUses = Uses.size();
-#endif
-    Use->replaceUsesOfWith(this, D);
-
-#ifndef NDEBUG      // only in -g mode...
-    if (Uses.size() == NumUses)
-      std::cerr << "Use: " << *Use << "replace with: " << *D;
-#endif
-    assert(Uses.size() != NumUses && "Didn't remove definition!");
+    // Must handle Constants specially, we cannot call replaceUsesOfWith on a
+    // constant!
+    if (Constant *C = dyn_cast<Constant>(Use)) {
+      C->replaceUsesOfWithOnConstant(this, New);
+    } else {
+      Use->replaceUsesOfWith(this, New);
+    }
   }
 }
 
@@ -73,19 +78,19 @@ void Value::refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
   Ty = NewTy;
 }
 
-void Value::killUse(User *i) {
-  if (i == 0) return;
-  use_iterator I = find(Uses.begin(), Uses.end(), i);
+void Value::killUse(User *U) {
+  if (U == 0) return;
+  unsigned i;
 
-  assert(I != Uses.end() && "Use not in uses list!!");
-  Uses.erase(I);
-}
+  // Scan backwards through the uses list looking for the user.  We do this
+  // because vectors like to be accessed on the end.  This is incredibly
+  // important from a performance perspective.
+  for (i = Uses.size()-1; Uses[i] != U; --i)
+    /* empty */;
 
-User *Value::use_remove(use_iterator &I) {
-  assert(I != Uses.end() && "Trying to remove the end of the use list!!!");
-  User *i = *I;
-  I = Uses.erase(I);
-  return i;
+  assert(i < Uses.size() && "Use not in uses list!!");
+  Uses[i] = Uses.back();
+  Uses.pop_back();
 }
 
 //===----------------------------------------------------------------------===//
@@ -102,6 +107,9 @@ User::User(const Type *Ty, ValueTy vty, const std::string &name)
 void User::replaceUsesOfWith(Value *From, Value *To) {
   if (From == To) return;   // Duh what?
 
+  assert(!isa<Constant>(this) &&
+         "Cannot call User::replaceUsesofWith on a constant!");
+
   for (unsigned i = 0, E = getNumOperands(); i != E; ++i)
     if (getOperand(i) == From) {  // Is This operand is pointing to oldval?
       // The side effects of this setOperand call include linking to
@@ -110,5 +118,3 @@ void User::replaceUsesOfWith(Value *From, Value *To) {
       setOperand(i, To); // Fix it now...
     }
 }
-
-