summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/llvm/Assembly/PrintModulePass.h10
-rw-r--r--lib/CodeGen/LLVMTargetMachine.cpp4
-rw-r--r--lib/VMCore/PrintModulePass.cpp27
-rw-r--r--tools/llvm-dis/llvm-dis.cpp3
-rw-r--r--tools/opt/opt.cpp3
5 files changed, 27 insertions, 20 deletions
diff --git a/include/llvm/Assembly/PrintModulePass.h b/include/llvm/Assembly/PrintModulePass.h
index 7f5acf418b..fb4f6a7e13 100644
--- a/include/llvm/Assembly/PrintModulePass.h
+++ b/include/llvm/Assembly/PrintModulePass.h
@@ -18,21 +18,21 @@
#ifndef LLVM_ASSEMBLY_PRINTMODULEPASS_H
#define LLVM_ASSEMBLY_PRINTMODULEPASS_H
-#include "llvm/Support/Streams.h"
#include <string>
namespace llvm {
class FunctionPass;
class ModulePass;
+ class raw_ostream;
/// createPrintModulePass - Create and return a pass that writes the
- /// module to the specified OStream.
- ModulePass *createPrintModulePass(llvm::OStream *OS, bool DeleteStream=false);
+ /// module to the specified raw_ostream.
+ ModulePass *createPrintModulePass(raw_ostream *OS, bool DeleteStream=false);
/// createPrintFunctionPass - Create and return a pass that prints
- /// functions to the specified OStream as they are processed.
+ /// functions to the specified raw_ostream as they are processed.
FunctionPass *createPrintFunctionPass(const std::string &Banner,
- llvm::OStream *OS,
+ raw_ostream *OS,
bool DeleteStream=false);
} // End llvm namespace
diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp
index bc3c9910b4..fa386b00f7 100644
--- a/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/lib/CodeGen/LLVMTargetMachine.cpp
@@ -151,7 +151,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) {
if (!Fast) {
PM.add(createLoopStrengthReducePass(getTargetLowering()));
if (PrintLSR)
- PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr));
+ PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &errs()));
}
PM.add(createGCLoweringPass());
@@ -168,7 +168,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) {
if (PrintISelInput)
PM.add(createPrintFunctionPass("\n\n"
"*** Final LLVM Code input to ISel ***\n",
- &cerr));
+ &errs()));
// Standard Lower-Level Passes.
diff --git a/lib/VMCore/PrintModulePass.cpp b/lib/VMCore/PrintModulePass.cpp
index 6740af7069..61e5889bb7 100644
--- a/lib/VMCore/PrintModulePass.cpp
+++ b/lib/VMCore/PrintModulePass.cpp
@@ -17,18 +17,19 @@
#include "llvm/Module.h"
#include "llvm/Pass.h"
#include "llvm/Support/Compiler.h"
+#include "llvm/Support/raw_ostream.h"
using namespace llvm;
namespace {
class VISIBILITY_HIDDEN PrintModulePass : public ModulePass {
- OStream *Out; // ostream to print on
+ raw_ostream *Out; // raw_ostream to print on
bool DeleteStream; // Delete the ostream in our dtor?
public:
static char ID;
- PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr),
+ PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&errs()),
DeleteStream(false) {}
- PrintModulePass(OStream *o, bool DS)
+ PrintModulePass(raw_ostream *o, bool DS)
: ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {}
~PrintModulePass() {
@@ -36,7 +37,8 @@ namespace {
}
bool runOnModule(Module &M) {
- (*Out) << M << std::flush;
+ (*Out) << M;
+ Out->flush();
return false;
}
@@ -47,13 +49,13 @@ namespace {
class PrintFunctionPass : public FunctionPass {
std::string Banner; // String to print before each function
- OStream *Out; // ostream to print on
+ raw_ostream *Out; // raw_ostream to print on
bool DeleteStream; // Delete the ostream in our dtor?
public:
static char ID;
- PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr),
+ PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&errs()),
DeleteStream(false) {}
- PrintFunctionPass(const std::string &B, OStream *o, bool DS)
+ PrintFunctionPass(const std::string &B, raw_ostream *o, bool DS)
: FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {}
inline ~PrintFunctionPass() {
@@ -65,6 +67,7 @@ namespace {
//
bool runOnFunction(Function &F) {
(*Out) << Banner << static_cast<Value&>(F);
+ Out->flush();
return false;
}
@@ -82,15 +85,17 @@ static RegisterPass<PrintFunctionPass>
Y("print-function","Print function to stderr");
/// createPrintModulePass - Create and return a pass that writes the
-/// module to the specified OStream.
-ModulePass *llvm::createPrintModulePass(llvm::OStream *OS, bool DeleteStream) {
+/// module to the specified raw_ostream.
+ModulePass *llvm::createPrintModulePass(llvm::raw_ostream *OS,
+ bool DeleteStream) {
return new PrintModulePass(OS, DeleteStream);
}
/// createPrintFunctionPass - Create and return a pass that prints
-/// functions to the specified OStream as they are processed.
+/// functions to the specified raw_ostream as they are processed.
FunctionPass *llvm::createPrintFunctionPass(const std::string &Banner,
- OStream *OS, bool DeleteStream) {
+ llvm::raw_ostream *OS,
+ bool DeleteStream) {
return new PrintFunctionPass(Banner, OS, DeleteStream);
}
diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 276b1e4953..89f19e1dae 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -24,6 +24,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Streams.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/System/Signals.h"
#include <iostream>
#include <fstream>
@@ -117,7 +118,7 @@ int main(int argc, char **argv) {
// All that llvm-dis does is write the assembly to a file.
if (!DontPrint) {
PassManager Passes;
- OStream L(*Out);
+ raw_os_ostream L(*Out);
Passes.add(createPrintModulePass(&L));
Passes.run(*M.get());
}
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 358cbdabfb..a339d316ea 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -30,6 +30,7 @@
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/LinkAllPasses.h"
#include "llvm/LinkAllVMCore.h"
#include <iostream>
@@ -543,7 +544,7 @@ int main(int argc, char **argv) {
}
if (PrintEachXForm)
- Passes.add(createPrintModulePass(&cerr));
+ Passes.add(createPrintModulePass(&errs()));
}
// If -std-compile-opts was specified at the end of the pass list, add them.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 19:43:12 +0000