diff options
author | Daniel Dunbar <daniel@zuster.org> | 2008-10-22 17:39:14 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2008-10-22 17:39:14 +0000 |
commit | d1ce3b48e24b9e7d78cac590d1e4590a68c2e2ce (patch) | |
tree | f08c738cbc6061a734f03553b39f793d0dfbb939 /lib/Bitcode | |
parent | e80d67ec11cff70700a13b54a4c057afd58ed33c (diff) | |
download | external_llvm-d1ce3b48e24b9e7d78cac590d1e4590a68c2e2ce.zip external_llvm-d1ce3b48e24b9e7d78cac590d1e4590a68c2e2ce.tar.gz external_llvm-d1ce3b48e24b9e7d78cac590d1e4590a68c2e2ce.tar.bz2 |
Add raw_ostream versions of WriteBitcodeToFile and BitcodeWriterPass.
- The old versions are still hanging around, but should be migrated
away from.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57989 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Bitcode')
-rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 10 | ||||
-rw-r--r-- | lib/Bitcode/Writer/BitcodeWriterPass.cpp | 21 |
2 files changed, 26 insertions, 5 deletions
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 408a352..913c2bc 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -24,6 +24,7 @@ #include "llvm/ValueSymbolTable.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/Streams.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/System/Program.h" using namespace llvm; @@ -1330,6 +1331,13 @@ static void EmitDarwinBCTrailer(BitstreamWriter &Stream, unsigned BufferSize) { /// WriteBitcodeToFile - Write the specified module to the specified output /// stream. void llvm::WriteBitcodeToFile(const Module *M, std::ostream &Out) { + raw_os_ostream RawOut(Out); + WriteBitcodeToFile(M, RawOut); +} + +/// WriteBitcodeToFile - Write the specified module to the specified output +/// stream. +void llvm::WriteBitcodeToFile(const Module *M, raw_ostream &Out) { std::vector<unsigned char> Buffer; BitstreamWriter Stream(Buffer); @@ -1356,7 +1364,7 @@ void llvm::WriteBitcodeToFile(const Module *M, std::ostream &Out) { // If writing to stdout, set binary mode. - if (llvm::cout == Out) + if (&llvm::outs() == &Out) sys::Program::ChangeStdoutToBinary(); // Write the generated bitstream to "Out". diff --git a/lib/Bitcode/Writer/BitcodeWriterPass.cpp b/lib/Bitcode/Writer/BitcodeWriterPass.cpp index dd16fab..209cf09 100644 --- a/lib/Bitcode/Writer/BitcodeWriterPass.cpp +++ b/lib/Bitcode/Writer/BitcodeWriterPass.cpp @@ -17,16 +17,24 @@ using namespace llvm; namespace { class WriteBitcodePass : public ModulePass { - std::ostream &Out; // ostream to print on + // FIXME: Kill off std::ostream + std::ostream *Out; + raw_ostream *RawOut; // raw_ostream to print on public: - static char ID; // Pass identifcation, replacement for typeid + static char ID; // Pass identification, replacement for typeid explicit WriteBitcodePass(std::ostream &o) - : ModulePass(&ID), Out(o) {} + : ModulePass(&ID), Out(&o), RawOut(0) {} + explicit WriteBitcodePass(raw_ostream &o) + : ModulePass(&ID), Out(0), RawOut(&o) {} const char *getPassName() const { return "Bitcode Writer"; } bool runOnModule(Module &M) { - WriteBitcodeToFile(&M, Out); + if (Out) { + WriteBitcodeToFile(&M, *Out); + } else { + WriteBitcodeToFile(&M, *RawOut); + } return false; } }; @@ -41,3 +49,8 @@ ModulePass *llvm::CreateBitcodeWriterPass(std::ostream &Str) { } +/// createBitcodeWriterPass - Create and return a pass that writes the module +/// to the specified ostream. +ModulePass *llvm::createBitcodeWriterPass(raw_ostream &Str) { + return new WriteBitcodePass(Str); +} |