From 87182ae6baf28ca6da6ee4bc00cf1857f293acfe Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 7 Apr 2002 22:31:23 +0000 Subject: [PATCH] Eliminate explicit use of Writer library, using debug dump output instead. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2147 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 14 ++++++++------ lib/Transforms/Utils/Linker.cpp | 14 ++++++++------ lib/VMCore/Linker.cpp | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index f3955c89b44..9637f747e28 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -31,9 +31,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 +71,11 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { static void PrintMap(const map &M) { for (map::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 +137,9 @@ static Value *RemapOperand(const Value *In, map &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; } diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index f3955c89b44..9637f747e28 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -31,9 +31,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 +71,11 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { static void PrintMap(const map &M) { for (map::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 +137,9 @@ static Value *RemapOperand(const Value *In, map &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; } diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index f3955c89b44..9637f747e28 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -31,9 +31,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 +71,11 @@ static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) { static void PrintMap(const map &M) { for (map::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 +137,9 @@ static Value *RemapOperand(const Value *In, map &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; } -- 2.34.1