[llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y

[Chris Lattner]

Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.156 -> 1.157

---
Log message:

Eliminate a REALLY HORRIBLE API: mutateReferences, which is gross gross gross.


---
Diffs of the changes:  (+7 -5)

Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.156 llvm/lib/AsmParser/llvmAsmParser.y:1.157
--- llvm/lib/AsmParser/llvmAsmParser.y:1.156	Mon Feb  9 15:03:38 2004
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Mar  8 00:09:57 2004
@@ -73,7 +73,7 @@
   // here.  This is used for forward references of ConstantPointerRefs.
   //
   typedef std::map<std::pair<const PointerType *,
-                             ValID>, GlobalVariable*> GlobalRefsType;
+                             ValID>, GlobalValue*> GlobalRefsType;
   GlobalRefsType GlobalRefs;
 
   void ModuleDone() {
@@ -114,7 +114,7 @@
       GlobalRefs.find(std::make_pair(GV->getType(), D));
 
     if (I != GlobalRefs.end()) {
-      GlobalVariable *OldGV = I->second;   // Get the placeholder...
+      GlobalValue *OldGV = I->second;   // Get the placeholder...
       I->first.second.destroy();  // Free string memory if necessary
       
       // Loop over all of the uses of the GlobalValue.  The only thing they are
@@ -125,12 +125,14 @@
         
       // Change the const pool reference to point to the real global variable
       // now.  This should drop a use from the OldGV.
-      CPR->mutateReferences(OldGV, GV);
+      CPR->replaceUsesOfWithOnConstant(OldGV, GV);
       assert(OldGV->use_empty() && "All uses should be gone now!");
       
       // Remove OldGV from the module...
-      CurrentModule->getGlobalList().remove(OldGV);
-      delete OldGV;                        // Delete the old placeholder
+      if (GlobalVariable *GVar = dyn_cast<GlobalVariable>(OldGV))
+        CurrentModule->getGlobalList().erase(GVar);
+      else
+        CurrentModule->getFunctionList().erase(cast<Function>(OldGV));
       
       // Remove the map entry for the global now that it has been created...
       GlobalRefs.erase(I);