Eliminate the PromoteInstance class, incorporating it into the PromotePass

[oota-llvm.git] / lib / Transforms / Utils / Linker.cpp

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index f3955c89b44766444999d32502e399d83be981e4..086c6c6b28f062fc4b897297a6f37989ac20cbfb 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -18,6 +18,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/iOther.h"
 #include "llvm/ConstantVals.h"
+#include "llvm/Argument.h"
 #include <iostream>
 using std::cerr;
 using std::string;
@@ -31,9 +32,6 @@ static inline bool Error(string *E, string Message) {
   return true;
 }
 
-#include "llvm/Assembly/Writer.h" // TODO: REMOVE
-
-
 // LinkTypes - Go through the symbol table of the Src module and see if any
 // types are named in the src module that are not named in the Dst module.
 // Make sure there are no type name conflicts.
@@ -74,8 +72,11 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) {
 static void PrintMap(const map<const Value*, Value*> &M) {
   for (map<const Value*, Value*>::const_iterator I = M.begin(), E = M.end();
        I != E; ++I) {
-    cerr << " Fr: " << (void*)I->first << " " << I->first 
-         << " To: " << (void*)I->second << " " << I->second << "\n";
+    cerr << " Fr: " << (void*)I->first << " ";
+    I->first->dump();
+    cerr << " To: " << (void*)I->second << " ";
+    I->second->dump();
+    cerr << "\n";
   }
 }
 
@@ -137,7 +138,9 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
     PrintMap(*GlobalMap);
   }
 
-  cerr << "Couldn't remap value: " << (void*)In << " " << In << "\n";
+  cerr << "Couldn't remap value: " << (void*)In << " ";
+  In->dump();
+  cerr << "\n";
   assert(0 && "Couldn't remap value!");
   return 0;
 }
@@ -299,10 +302,10 @@ static bool LinkFunctionBody(Function *Dest, const Function *Src,
   for (Function::ArgumentListType::const_iterator 
          I = Src->getArgumentList().begin(),
          E = Src->getArgumentList().end(); I != E; ++I) {
-    const FunctionArgument *SMA = *I;
+    const Argument *SMA = *I;
 
     // Create the new method argument and add to the dest method...
-    FunctionArgument *DMA = new FunctionArgument(SMA->getType(),SMA->getName());
+    Argument *DMA = new Argument(SMA->getType(), SMA->getName());
     Dest->getArgumentList().push_back(DMA);
 
     // Add a mapping to our local map