diff options
author | Bill Wendling <isanbard@gmail.com> | 2006-12-07 01:30:32 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2006-12-07 01:30:32 +0000 |
commit | e81561909d128c6e2d8033cb5465a49b2596b26a (patch) | |
tree | 6f2845604d482bc86d8d12aae500292c561d8cd7 /lib/VMCore | |
parent | 85c671b90870705ba7e10baf99aa306c843f1325 (diff) | |
download | external_llvm-e81561909d128c6e2d8033cb5465a49b2596b26a.zip external_llvm-e81561909d128c6e2d8033cb5465a49b2596b26a.tar.gz external_llvm-e81561909d128c6e2d8033cb5465a49b2596b26a.tar.bz2 |
Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32298 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore')
-rw-r--r-- | lib/VMCore/AsmWriter.cpp | 10 | ||||
-rw-r--r-- | lib/VMCore/LeakDetector.cpp | 19 | ||||
-rw-r--r-- | lib/VMCore/PassManager.cpp | 2 | ||||
-rw-r--r-- | lib/VMCore/TypeSymbolTable.cpp | 20 | ||||
-rw-r--r-- | lib/VMCore/Verifier.cpp | 5 |
5 files changed, 27 insertions, 29 deletions
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 30baed4..072fc51 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -829,7 +829,7 @@ void AssemblyWriter::printGlobal(const GlobalVariable *GV) { case GlobalValue::ExternalWeakLinkage: Out << "extern_weak "; break; case GlobalValue::ExternalLinkage: break; case GlobalValue::GhostLinkage: - llvm_cerr << "GhostLinkage not allowed in AsmWriter!\n"; + cerr << "GhostLinkage not allowed in AsmWriter!\n"; abort(); } @@ -928,7 +928,7 @@ void AssemblyWriter::printFunction(const Function *F) { case GlobalValue::ExternalWeakLinkage: Out << "extern_weak "; break; case GlobalValue::ExternalLinkage: break; case GlobalValue::GhostLinkage: - llvm_cerr << "GhostLinkage not allowed in AsmWriter!\n"; + cerr << "GhostLinkage not allowed in AsmWriter!\n"; abort(); } @@ -1328,18 +1328,18 @@ void Argument::print(std::ostream &o) const { // Value::dump - allow easy printing of Values from the debugger. // Located here because so much of the needed functionality is here. -void Value::dump() const { print(std::cerr); llvm_cerr << '\n'; } +void Value::dump() const { print(std::cerr); cerr << '\n'; } // Type::dump - allow easy printing of Values from the debugger. // Located here because so much of the needed functionality is here. -void Type::dump() const { print(std::cerr); llvm_cerr << '\n'; } +void Type::dump() const { print(std::cerr); cerr << '\n'; } //===----------------------------------------------------------------------===// // SlotMachine Implementation //===----------------------------------------------------------------------===// #if 0 -#define SC_DEBUG(X) llvm_cerr << X +#define SC_DEBUG(X) cerr << X #else #define SC_DEBUG(X) #endif diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp index 4c9f125..68bf161 100644 --- a/lib/VMCore/LeakDetector.cpp +++ b/lib/VMCore/LeakDetector.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/Compiler.h" #include "llvm/Support/LeakDetector.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/Streams.h" #include "llvm/Value.h" #include <set> @@ -21,12 +21,12 @@ using namespace llvm; namespace { template <class T> struct VISIBILITY_HIDDEN PrinterTrait { - static void print(const T* P) { llvm_cerr << P; } + static void print(const T* P) { cerr << P; } }; template<> struct VISIBILITY_HIDDEN PrinterTrait<Value> { - static void print(const Value* P) { llvm_cerr << *P; } + static void print(const Value* P) { cerr << *P; } }; template <typename T> @@ -59,15 +59,14 @@ namespace { assert(Cache == 0 && "No value should be cached anymore!"); if (!Ts.empty()) { - llvm_cerr - << "Leaked " << Name << " objects found: " << Message << ":\n"; + cerr << "Leaked " << Name << " objects found: " << Message << ":\n"; for (typename std::set<const T*>::iterator I = Ts.begin(), E = Ts.end(); I != E; ++I) { - llvm_cerr << "\t"; + cerr << "\t"; PrinterTrait<T>::print(*I); - llvm_cerr << "\n"; + cerr << "\n"; } - llvm_cerr << '\n'; + cerr << '\n'; return true; } @@ -123,8 +122,8 @@ void LeakDetector::checkForGarbageImpl(const std::string &Message) { // use non-short-circuit version so that both checks are performed if (getObjects().hasGarbage(Message) | getLLVMObjects().hasGarbage(Message)) - llvm_cerr << "\nThis is probably because you removed an object, but didn't " - << "delete it. Please check your code for memory leaks.\n"; + cerr << "\nThis is probably because you removed an object, but didn't " + << "delete it. Please check your code for memory leaks.\n"; // Clear out results so we don't get duplicate warnings on // next call... diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp index d01ef3e..7fdc62a 100644 --- a/lib/VMCore/PassManager.cpp +++ b/lib/VMCore/PassManager.cpp @@ -442,7 +442,7 @@ bool FunctionPassManager_New::runOnModule(Module &M) { bool FunctionPassManager_New::run(Function &F) { std::string errstr; if (MP->materializeFunction(&F, &errstr)) { - llvm_cerr << "Error reading bytecode file: " << errstr << "\n"; + cerr << "Error reading bytecode file: " << errstr << "\n"; abort(); } return FPM->runOnFunction(F); diff --git a/lib/VMCore/TypeSymbolTable.cpp b/lib/VMCore/TypeSymbolTable.cpp index 7af7bea..cfd8cbf 100644 --- a/lib/VMCore/TypeSymbolTable.cpp +++ b/lib/VMCore/TypeSymbolTable.cpp @@ -66,7 +66,7 @@ Type* TypeSymbolTable::erase(iterator Entry) { #if DEBUG_SYMBOL_TABLE dump(); - llvm_cerr << " Removing Value: " << Result->getName() << "\n"; + cerr << " Removing Value: " << Result->getName() << "\n"; #endif tmap.erase(Entry); @@ -75,7 +75,7 @@ Type* TypeSymbolTable::erase(iterator Entry) { // list... if (Result->isAbstract()) { #if DEBUG_ABSTYPE - llvm_cerr << "Removing abstract type from symtab" << Result->getDescription()<<"\n"; + cerr << "Removing abstract type from symtab" << Result->getDescription()<<"\n"; #endif cast<DerivedType>(Result)->removeAbstractTypeUser(this); } @@ -95,8 +95,8 @@ void TypeSymbolTable::insert(const std::string& Name, const Type* T) { #if DEBUG_SYMBOL_TABLE dump(); - llvm_cerr << " Inserting type: " << UniqueName << ": " - << T->getDescription() << "\n"; + cerr << " Inserting type: " << UniqueName << ": " + << T->getDescription() << "\n"; #endif // Insert the tmap entry @@ -106,7 +106,7 @@ void TypeSymbolTable::insert(const std::string& Name, const Type* T) { if (T->isAbstract()) { cast<DerivedType>(T)->addAbstractTypeUser(this); #if DEBUG_ABSTYPE - llvm_cerr << "Added abstract type to ST: " << T->getDescription() << "\n"; + cerr << "Added abstract type to ST: " << T->getDescription() << "\n"; #endif } } @@ -152,14 +152,14 @@ void TypeSymbolTable::refineAbstractType(const DerivedType *OldType, for (iterator I = begin(), E = end(); I != E; ++I) { if (I->second == (Type*)OldType) { // FIXME when Types aren't const. #if DEBUG_ABSTYPE - llvm_cerr << "Removing type " << OldType->getDescription() << "\n"; + cerr << "Removing type " << OldType->getDescription() << "\n"; #endif OldType->removeAbstractTypeUser(this); I->second = (Type*)NewType; // TODO FIXME when types aren't const if (NewType->isAbstract()) { #if DEBUG_ABSTYPE - llvm_cerr << "Added type " << NewType->getDescription() << "\n"; + cerr << "Added type " << NewType->getDescription() << "\n"; #endif cast<DerivedType>(NewType)->addAbstractTypeUser(this); } @@ -179,13 +179,13 @@ void TypeSymbolTable::typeBecameConcrete(const DerivedType *AbsTy) { } static void DumpTypes(const std::pair<const std::string, const Type*>& T ) { - llvm_cerr << " '" << T.first << "' = "; + cerr << " '" << T.first << "' = "; T.second->dump(); - llvm_cerr << "\n"; + cerr << "\n"; } void TypeSymbolTable::dump() const { - llvm_cerr << "TypeSymbolPlane: "; + cerr << "TypeSymbolPlane: "; for_each(tmap.begin(), tmap.end(), DumpTypes); } diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 4e43a0c..cf812a8 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -60,7 +60,6 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/Support/Compiler.h" #include <algorithm> -#include <sstream> #include <cstdarg> using namespace llvm; @@ -156,11 +155,11 @@ namespace { // Anonymous namespace for class switch (action) { case AbortProcessAction: msgs << "compilation aborted!\n"; - llvm_cerr << msgs.str(); + cerr << msgs.str(); abort(); case PrintMessageAction: msgs << "verification continues.\n"; - llvm_cerr << msgs.str(); + cerr << msgs.str(); return false; case ReturnStatusAction: msgs << "compilation terminated.\n"; |